Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 242:a2edb4481f19
hgmerge: use diff3 if available
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgmerge: use diff3 if available
diff3 may be more readily available than merge
manifest hash: 67a314ac42aa78410d64a6c3d36c2d575a588533
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk
xZlQHYIGrCLOFQiCQxIfr7I=
=Asv9
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 18:42:53 -0800 |
parents | 737c66b68290 |
children | a69c3b2957d1 |
comparison
equal
deleted
inserted
replaced
241:afe895fcc0d0 | 242:a2edb4481f19 |
---|---|
16 | 16 |
17 # Attempt to do a non-interactive merge | 17 # Attempt to do a non-interactive merge |
18 if which merge > /dev/null ; then | 18 if which merge > /dev/null ; then |
19 if merge $LOCAL $BASE $OTHER 2> /dev/null; then | 19 if merge $LOCAL $BASE $OTHER 2> /dev/null; then |
20 # success! | 20 # success! |
21 exit 0 | |
22 fi | |
23 cp $LOCAL.orig $LOCAL | |
24 elif which diff3 > /dev/null ; then | |
25 if diff3 -m $LOCAL.orig $BASE $OTHER > $LOCAL ; then | |
26 # success | |
21 exit 0 | 27 exit 0 |
22 fi | 28 fi |
23 cp $LOCAL.orig $LOCAL | 29 cp $LOCAL.orig $LOCAL |
24 fi | 30 fi |
25 | 31 |
43 | 49 |
44 # Attempt to do a merge with $EDITOR | 50 # Attempt to do a merge with $EDITOR |
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 |
51 if which diff > /dev/null ; then | 64 if which diff > /dev/null ; then |
52 if which patch > /dev/null ; then | 65 if which patch > /dev/null ; then |
62 fi | 75 fi |
63 fi | 76 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 |