+# hgmerge.sh - invoke diff3 to merge files, save conflicts in mine.hgmerge
+# author: Noel Burton-Krahn
+# exit on error or undefined variables
+# where to save merged file
+cp $other "$mine.other~"
+if diff3 -L mine -L original -L other -E -m "$mine" "$orig" "$other" > "$merged"