Mercurial Mercurial > hg > stx-projects-smalltalk / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1442
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     1
 
[automerge]
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     2
 
# Automatically merge pulled changes from specified mercurial branch (if exists)
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     3
 
# to specified mercurial branch (if exists). The syntax is
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     4
 
#
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     5
 
# automerge = <from-branch>:<to branch>.
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     6
 
#
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     7
 
# The example below will merge changed from branch `default` to branch `jv`.
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     8
 
# If merge fails, issue a warning but proceed. Optional.
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     9
 
#
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    10
 
# automerge = default:jv
14aa87cd5d2d Added SmalltalkStartup class
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    11
 
automerge = default:jv
hg/stx-projects-smalltalk