author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Mon, 24 Sep 2018 20:52:34 +0100 | |
branch | jv |
changeset 1579 | e6c2667b4692 |
parent 1442 | 14aa87cd5d2d |
permissions | -rw-r--r-- |
[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