Show More
@@ -21,6 +21,12 b' if which merge > /dev/null ; then' | |||||
21 | exit 0 |
|
21 | exit 0 | |
22 | fi |
|
22 | fi | |
23 | cp $LOCAL.orig $LOCAL |
|
23 | cp $LOCAL.orig $LOCAL | |
|
24 | elif which diff3 > /dev/null ; then | |||
|
25 | if diff3 -m $LOCAL.orig $BASE $OTHER > $LOCAL ; then | |||
|
26 | # success | |||
|
27 | exit 0 | |||
|
28 | fi | |||
|
29 | cp $LOCAL.orig $LOCAL | |||
24 | fi |
|
30 | fi | |
25 |
|
31 | |||
26 | # try using kdiff3, which is fairly nice |
|
32 | # try using kdiff3, which is fairly nice | |
@@ -45,6 +51,13 b' fi' | |||||
45 | if which merge > /dev/null ; then |
|
51 | if which merge > /dev/null ; then | |
46 | echo "conflicts detected in $LOCAL" |
|
52 | echo "conflicts detected in $LOCAL" | |
47 | merge $LOCAL $BASE $OTHER 2>/dev/null || $EDITOR $LOCAL |
|
53 | merge $LOCAL $BASE $OTHER 2>/dev/null || $EDITOR $LOCAL | |
|
54 | exit 0 | |||
|
55 | fi | |||
|
56 | ||||
|
57 | if which diff3 > /dev/null ; then | |||
|
58 | echo "conflicts detected in $LOCAL" | |||
|
59 | diff3 -m $LOCAL.orig $BASE $OTHER > $LOCAL || $EDITOR $LOCAL | |||
|
60 | exit 0 | |||
48 | fi |
|
61 | fi | |
49 |
|
62 | |||
50 | # attempt to manually merge with diff and patch |
|
63 | # attempt to manually merge with diff and patch | |
@@ -64,5 +77,3 b' fi' | |||||
64 |
|
77 | |||
65 | echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!" |
|
78 | echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!" | |
66 | exit 1 |
|
79 | exit 1 | |
67 |
|
||||
68 |
|
General Comments 0
You need to be logged in to leave comments.
Login now