equal
deleted
inserted
replaced
1253 # hg stat |
1253 # hg stat |
1254 M f |
1254 M f |
1255 # hg resolve --list |
1255 # hg resolve --list |
1256 R f |
1256 R f |
1257 |
1257 |
|
1258 premerge=keep-mergediff keeps conflict markers with base content: |
|
1259 |
|
1260 $ beforemerge |
|
1261 [merge-tools] |
|
1262 false.whatever= |
|
1263 true.priority=1 |
|
1264 true.executable=cat |
|
1265 # hg update -C 1 |
|
1266 $ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff |
|
1267 merging f |
|
1268 <<<<<<< |
|
1269 ------- base |
|
1270 +++++++ working copy: ef83787e2614 - test: revision 1 |
|
1271 -revision 0 |
|
1272 +revision 1 |
|
1273 space |
|
1274 ======= merge rev: 81448d39c9a0 - test: revision 4 |
|
1275 revision 4 |
|
1276 >>>>>>> |
|
1277 revision 0 |
|
1278 space |
|
1279 revision 4 |
|
1280 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1281 (branch merge, don't forget to commit) |
|
1282 $ aftermerge |
|
1283 # cat f |
|
1284 <<<<<<< |
|
1285 ------- base |
|
1286 +++++++ working copy: ef83787e2614 - test: revision 1 |
|
1287 -revision 0 |
|
1288 +revision 1 |
|
1289 space |
|
1290 ======= merge rev: 81448d39c9a0 - test: revision 4 |
|
1291 revision 4 |
|
1292 >>>>>>> |
|
1293 # hg stat |
|
1294 M f |
|
1295 # hg resolve --list |
|
1296 R f |
|
1297 |
1258 premerge=keep respects ui.mergemarkers=basic: |
1298 premerge=keep respects ui.mergemarkers=basic: |
1259 |
1299 |
1260 $ beforemerge |
1300 $ beforemerge |
1261 [merge-tools] |
1301 [merge-tools] |
1262 false.whatever= |
1302 false.whatever= |