$NetBSD: patch-threewaymerge,v 1.1 2006/04/11 17:38:57 rillig Exp $

For some weird reason, g++ 3.3.3 complains about a syntax error here.

--- src/arx/libarx/merge_branches/three_way_merge.cpp.orig	2005-11-17 20:06:21.000000000 +0100
+++ src/arx/libarx/merge_branches/three_way_merge.cpp	2006-04-11 15:07:43.000000000 +0200
@@ -143,7 +143,7 @@ Conflicts three_way_merge(const Parsed_N
                                make_pair(ancestor_temp.string(),
                                          sibling_temp.string())));
 
-                  path merge_path(path(getenv("HOME"))/".arx/merge3");
+                  path merge_path = (path(getenv("HOME"))/".arx/merge3");
                   if(fs::exists(merge_path))
                     {
                       Spawn s;