Mercurial > hg

changeset 830:ca080d28d0af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If rejects are empty after using the editor, merge with diff+patch was ok.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Aug 2005 17:23:31 +0100
parents 764b0350acb8
children 232d0616a80a
files hgmerge
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgmerge	Thu Aug 04 17:16:41 2005 +0100
+++ b/hgmerge	Thu Aug 04 17:23:31 2005 +0100
@@ -75,7 +75,8 @@
     if patch "$LOCAL" < "$HGTMP/diff"; then
 	cleanup_exit 0
     else
-	$EDITOR "$LOCAL" "$LOCAL.rej"
+	# If rejects are empty after using the editor, merge was ok
+	$EDITOR "$LOCAL" "$LOCAL.rej" && test -s "$LOCAL.rej" || cleanup_exit 0
     fi
     cleanup_exit 1
 fi