Fixes and cleanups to hgeditor:

- "HG: merge resolve" isn't supported for a long time now.
- detection of unchanged commit message if signing is turned off.
- don't add manifest hash to commit message if not signing.

hgeditor

@@ -23,17 +23,9 b' case "${EDITOR:=vi}" in'
         ;;
 esac
 
-if grep -q "^HG: merge resolve" "$1" ; then
-    # we don't sign merges
-    exec $EDITOR "$1"
-else
     # Remove temporary files even if we get interrupted
     trap "cleanup_exit 255" TERM KILL INT QUIT ABRT
     T1=`mktemp`; T2=`mktemp`
-    MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-`
-
-    echo -e "\n\nmanifest hash: $MANIFEST" >> "$T1"
-    grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1"
     (
         cd "`hg root`"
         grep '^HG: changed' "$1" | cut -b 13- | while read changed; do
@@ -41,11 +33,18 b' else'
         done
     )
 
+echo > "$T1"
+if [ "$SIGN" == "1" ]; then
+    MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-`
+    echo -e "\nmanifest hash: $MANIFEST" >> "$T1"
+fi
+grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1"
+
     CHECKSUM=`md5sum "$T1"`
     $EDITOR "$T1" "$T2" || cleanup_exit $?
+echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 13
 
     if [ "$SIGN" == "1" ] ; then
-	echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 13
 	{
 	    head -n 1 "$T1"
 	    echo
@@ -54,6 +53,5 b' else'
     else
 	mv "$T1" "$1"
     fi
+
     cleanup_exit $?
-fi
-