.hgautomerge
branchjv
changeset 7768 662055177806
parent 7714 dcf48ff796c8
--- a/.hgautomerge	Thu Dec 29 00:20:56 2016 +0000
+++ b/.hgautomerge	Thu Dec 29 00:22:44 2016 +0000
@@ -9,3 +9,16 @@
 #
 # automerge = default:jv
 automerge = default:jv
+#
+# If defined and if merge succeeds (there are no unresolved conflicts), 
+# check the merged working copy using given command. The command is executed
+# with CWD set to repository root. `#{dir}` in the command string will be 
+# expanded to actuall repository path. 
+# Following commands are built-in: 
+# 
+# * internal:make - run `make`
+#
+# A command line option --check overrides this setting. See `hg-automerge --help`.
+# 
+# checkcmd = internal:make
+checkcmd = internal:make