equal
deleted
inserted
replaced
73 |
73 |
74 diff -u "$BASE" "$OTHER" > "$HGTMP/diff" |
74 diff -u "$BASE" "$OTHER" > "$HGTMP/diff" |
75 if patch "$LOCAL" < "$HGTMP/diff"; then |
75 if patch "$LOCAL" < "$HGTMP/diff"; then |
76 cleanup_exit 0 |
76 cleanup_exit 0 |
77 else |
77 else |
78 $EDITOR "$LOCAL" "$LOCAL.rej" |
78 # If rejects are empty after using the editor, merge was ok |
|
79 $EDITOR "$LOCAL" "$LOCAL.rej" && test -s "$LOCAL.rej" || cleanup_exit 0 |
79 fi |
80 fi |
80 cleanup_exit 1 |
81 cleanup_exit 1 |
81 fi |
82 fi |
82 |
83 |
83 echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!" |
84 echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!" |