Show More
| @@ -75,7 +75,8 b' if type diff > /dev/null 2>&1 && type pa' | |||||
| 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 | |
General Comments 0
You need to be logged in to leave comments.
Login now