Mercurial > hg
view tests/test-merge-revert2.out @ 1634:f49f602fae92
copy & rename can ignore removed source files
As mercurial now distinguishes deleted files from removed files,
we can skip removed source files while copying or renaming.
author | Robin Farine <robin.farine@terminus.org> |
---|---|
date | Tue, 24 Jan 2006 13:59:01 +1300 |
parents | 5a034646e472 |
children | 3b1b44b917f4 |
line wrap: on
line source
1:f4d7a8c73d23 0:232e179b3f29 f4d7a8c73d23 tip 232e179b3f29 232e179b3f29+ 232e179b3f29 f4d7a8c73d23 tip merge: warning: conflicts during merge merging file1 merging file1 failed! diff -r f4d7a8c73d23 file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 another line of text +<<<<<<< +changed file1 different +======= changed file1 +>>>>>>> M file1 f4d7a8c73d23+ tip f4d7a8c73d23 tip f4d7a8c73d23 tip f4d7a8c73d23 tip