.hgautomerge
author ca
Tue, 17 Dec 2019 16:40:54 +0100
branchjv
changeset 6787 51fbee1169fc
parent 5980 f729645cc31a
permissions -rw-r--r--
Optimize resize operation BUGFIX by ca class: PanelView added: #beVisible #beVisiblePostUpdate #storePreferredWidthOrHeight:for: optimize resize operation (grafted from fe96efd9e4022ca111e8bdd83394c97b1a6d2e21)

[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