# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1123172611 -3600
# Node ID ca080d28d0af34c7870fbbbd5797563d759c61f1
# Parent  764b0350acb8c6c261f597488e6928eb83204e76
If rejects are empty after using the editor, merge with diff+patch was ok.


diff -r 764b0350acb8 -r ca080d28d0af hgmerge
--- 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