equal
deleted
inserted
replaced
1866 (experimental.mergetempdirprefix version): |
1866 (experimental.mergetempdirprefix version): |
1867 |
1867 |
1868 $ hg update -q -C 1 |
1868 $ hg update -q -C 1 |
1869 $ hg mv f f.txt |
1869 $ hg mv f f.txt |
1870 $ hg ci -qm "f.txt" |
1870 $ hg ci -qm "f.txt" |
|
1871 warning: commit already existed in the repository! |
1871 $ hg update -q -C 2 |
1872 $ hg update -q -C 2 |
1872 $ hg merge -y -r tip --tool echo \ |
1873 $ hg merge -y -r tip --tool echo \ |
1873 > --config merge-tools.echo.args='$base $local $other $output' \ |
1874 > --config merge-tools.echo.args='$base $local $other $output' \ |
1874 > --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. |
1875 > --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. |
1875 merging f and f.txt to f.txt |
1876 merging f and f.txt to f.txt |