Added .hgautomerge configuration file for `hg-automerge.rb` script. jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 18 Nov 2016 20:50:35 +0000
branchjv
changeset 7714 dcf48ff796c8
parent 7602 f1afeef47a60
child 7715 925b859e1758
Added .hgautomerge configuration file for `hg-automerge.rb` script. See https://bitbucket.org/janvrany/jv-scripts
.hgautomerge
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgautomerge	Fri Nov 18 20:50:35 2016 +0000
@@ -0,0 +1,11 @@
+[automerge]
+# Automatically merge pulled changes from specified mercurial branch (if exists) 
+# to specified mercurial branch (if exists). The syntax is 
+# 
+# automerge = <from-branch>:<to branch>. 
+#
+# The example below will merge changed from branch `default` to branch `jv`. 
+# If merge fails, issue a warning but proceed. Optional. 
+#
+# automerge = default:jv
+automerge = default:jv