blob: 7d25e5f02ae1989551f40307400f8d4d69842f81 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
$NetBSD: patch-ae,v 1.1 2007/09/20 20:47:04 wiz 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;
|
