equal
deleted
inserted
replaced
1223 # hg update -C 1 |
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' |
1224 $ hg merge -r 4 --config merge-tools.true.premerge=keep --config 'merge-tools.true.args=$base $local $other $output' |
1225 merging f |
1225 merging f |
1226 revision 0 |
1226 revision 0 |
1227 space |
1227 space |
1228 <<<<<<< working copy: ef83787e2614 - test: revision 1 (known-bad-output !) |
1228 revision 1 |
1229 revision 1 |
1229 space |
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 |
1230 revision 4 |
1235 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
1231 <<<<<<< working copy: ef83787e2614 - test: revision 1 |
1236 revision 1 |
1232 revision 1 |
1237 space |
1233 space |
1238 ======= |
1234 ======= |