.hgautomerge
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 07 Jun 2017 14:41:35 +0100
branchjv
changeset 1513 4b7b0f9a8506
parent 1442 14aa87cd5d2d
permissions -rw-r--r--
Cleanup: Use `UserPreferences class >> loadSettingsFrom:` ...or `UserPreferences class >> loadSettings` to load preferences.

[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