Mercurial > hg
comparison tests/test-help.t @ 26224:a4da463df6cf
filemerge: add non-interactive :merge-local and :merge-other
There are two non-interactive internal merge tools, :other and :local,
but they don't really merge, they just pick all changes from the local
or other version of the file. In some situations, it is known that we
want a merge and also know that all merge conflicts should be resolved
in one direction. Although external merge tools can do this, sometimes
it can be convenient to do so from within hg, without invoking a merge
tool. These new :merge-local and :merge-other tools can do just that.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Thu, 10 Sep 2015 09:41:11 -0400 |
parents | 6832ba528d1a |
children | 1c6f7cc52da9 |
comparison
equal
deleted
inserted
replaced
26223:ed12abab068e | 26224:a4da463df6cf |
---|---|
1218 Uses the internal non-interactive simple merge algorithm for merging | 1218 Uses the internal non-interactive simple merge algorithm for merging |
1219 files. It will fail if there are any conflicts and leave markers in the | 1219 files. It will fail if there are any conflicts and leave markers in the |
1220 partially merged file. Markers will have two sections, one for each side | 1220 partially merged file. Markers will have two sections, one for each side |
1221 of merge. | 1221 of merge. |
1222 | 1222 |
1223 ":merge-local" | |
1224 Like :merge, but resolve all conflicts non-interactively in favor of the | |
1225 local changes. | |
1226 | |
1227 ":merge-other" | |
1228 Like :merge, but resolve all conflicts non-interactively in favor of the | |
1229 other changes. | |
1230 | |
1223 ":merge3" | 1231 ":merge3" |
1224 Uses the internal non-interactive simple merge algorithm for merging | 1232 Uses the internal non-interactive simple merge algorithm for merging |
1225 files. It will fail if there are any conflicts and leave markers in the | 1233 files. It will fail if there are any conflicts and leave markers in the |
1226 partially merged file. Marker will have three sections, one from each | 1234 partially merged file. Marker will have three sections, one from each |
1227 side of the merge and one for the base content. | 1235 side of the merge and one for the base content. |