equal
deleted
inserted
replaced
1207 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1207 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1208 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1208 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1209 [1] |
1209 [1] |
1210 |
1210 |
1211 #endif |
1211 #endif |
|
1212 |
|
1213 Verify naming of temporary files and that extension is preserved: |
|
1214 |
|
1215 $ hg update -q -C 1 |
|
1216 $ hg mv f f.txt |
|
1217 $ hg ci -qm "f.txt" |
|
1218 $ hg update -q -C 2 |
|
1219 $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' |
|
1220 merging f and f.txt to f.txt |
|
1221 */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) |
|
1222 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1223 (branch merge, don't forget to commit) |