Mercurial > hg
view tests/test-conflict.t @ 19973:1184edaead7a stable
patch: ensure valid git diffs if source/destination file is missing (issue4046)
This is arguably a workaround, a better fix may be in the repo to
ensure that it won't list a file 'modified' unless there is a file
context for the previous version.
author | Johan Bjork <jbjoerk@gmail.com> |
---|---|
date | Sun, 13 Oct 2013 08:38:30 -0400 |
parents | 2371f4aea665 |
children | 25d5a9ecbb85 |
line wrap: on
line source
$ hg init $ echo "nothing" > a $ hg add a $ hg commit -m ancestor $ echo "something" > a $ hg commit -m branch1 $ hg co 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo "something else" > a $ hg commit -m branch2 created new head $ hg merge 1 merging a warning: conflicts during merge. merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] $ hg id 32e80765d7fe+75234512624c+ tip $ cat a <<<<<<< local something else ======= something >>>>>>> other $ hg status M a ? a.orig