equal
deleted
inserted
replaced
1556 $ hg mv f f.txt |
1556 $ hg mv f f.txt |
1557 $ hg ci -qm "f.txt" |
1557 $ hg ci -qm "f.txt" |
1558 $ hg update -q -C 2 |
1558 $ hg update -q -C 2 |
1559 $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' |
1559 $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' |
1560 merging f and f.txt to f.txt |
1560 merging f and f.txt to f.txt |
1561 */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) |
1561 */f~base.* $TESTTMP/f.txt.orig */f~other.*.txt $TESTTMP/f.txt (glob) |
1562 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1562 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1563 (branch merge, don't forget to commit) |
1563 (branch merge, don't forget to commit) |
1564 |
1564 |
1565 Check that debugpicktool examines which merge tool is chosen for |
1565 Check that debugpicktool examines which merge tool is chosen for |
1566 specified file as expected |
1566 specified file as expected |