.hgautomerge
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 19 Jul 2017 09:42:32 +0200
branchjv
changeset 17619 edb119820fcb
parent 17135 81b78926f09a
permissions -rw-r--r--
Issue #154: Set window style using `#beToolWindow` to indicate that the minirunner window is kind of support tool rather than some X11 specific code (which does not work on Windows of course) See https://swing.fit.cvut.cz/projects/stx-jv/ticket/154

[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
#
# 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