.hgautomerge
author Jan Vrany <jan.vrany@fit.cvut.cz>
Fri, 18 Nov 2016 20:50:35 +0000
branchjv
changeset 7714 dcf48ff796c8
child 7768 662055177806
permissions -rw-r--r--
Added .hgautomerge configuration file for `hg-automerge.rb` script. See https://bitbucket.org/janvrany/jv-scripts

[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