equal
deleted
inserted
replaced
1211 # hg stat |
1211 # hg stat |
1212 M f |
1212 M f |
1213 # hg resolve --list |
1213 # hg resolve --list |
1214 R f |
1214 R f |
1215 |
1215 |
|
1216 with premerge=keep and $output in tool args, $local does not have markers: |
|
1217 |
|
1218 $ beforemerge |
|
1219 [merge-tools] |
|
1220 false.whatever= |
|
1221 true.priority=1 |
|
1222 true.executable=cat |
|
1223 # hg update -C 1 |
|
1224 $ hg merge -r 4 --config merge-tools.true.premerge=keep --config 'merge-tools.true.args=$base $local $other $output' |
|
1225 merging f |
|
1226 revision 0 |
|
1227 space |
|
1228 <<<<<<< working copy: ef83787e2614 - test: revision 1 (known-bad-output !) |
|
1229 revision 1 |
|
1230 space |
|
1231 ======= (known-bad-output !) |
|
1232 revision 4 (known-bad-output !) |
|
1233 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 (known-bad-output !) |
|
1234 revision 4 |
|
1235 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
1236 revision 1 |
|
1237 space |
|
1238 ======= |
|
1239 revision 4 |
|
1240 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
|
1241 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1242 (branch merge, don't forget to commit) |
|
1243 $ aftermerge |
|
1244 # cat f |
|
1245 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
1246 revision 1 |
|
1247 space |
|
1248 ======= |
|
1249 revision 4 |
|
1250 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
|
1251 # hg stat |
|
1252 M f |
|
1253 # hg resolve --list |
|
1254 R f |
|
1255 |
1216 premerge=keep-merge3 keeps conflict markers with base content: |
1256 premerge=keep-merge3 keeps conflict markers with base content: |
1217 |
1257 |
1218 $ beforemerge |
1258 $ beforemerge |
1219 [merge-tools] |
1259 [merge-tools] |
1220 false.whatever= |
1260 false.whatever= |