author | Merge Script |
Mon, 12 Dec 2016 07:06:44 +0100 | |
branch | jv |
changeset 7737 | 2e6c6d117f72 |
parent 7714 | dcf48ff796c8 |
child 7768 | 662055177806 |
permissions | -rw-r--r-- |
7714
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1 |
[automerge] |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
2 |
# Automatically merge pulled changes from specified mercurial branch (if exists) |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
3 |
# to specified mercurial branch (if exists). The syntax is |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
4 |
# |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
5 |
# automerge = <from-branch>:<to branch>. |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
6 |
# |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
7 |
# The example below will merge changed from branch `default` to branch `jv`. |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
8 |
# If merge fails, issue a warning but proceed. Optional. |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
9 |
# |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
10 |
# automerge = default:jv |
dcf48ff796c8
Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
11 |
automerge = default:jv |