Mercurial > hg > mercurial-source

comparison tests/test-merge-revert2.t @ 15510:2371f4aea665

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: give a special message for internal:merge failure (issue3105)
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Nov 2011 18:04:19 -0600
parents 4134686b83e1
children 25d5a9ecbb85
comparison
equal deleted inserted replaced
15509:d5abe76da61e 15510:2371f4aea665
43 $ echo "changed file1 different" >> file1 43 $ echo "changed file1 different" >> file1
44 44
45 $ hg update 45 $ hg update
46 merging file1 46 merging file1
47 warning: conflicts during merge. 47 warning: conflicts during merge.
48 merging file1 failed! 48 merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
50 use 'hg resolve' to retry unresolved file merges 50 use 'hg resolve' to retry unresolved file merges
51 [1] 51 [1]
52 52
53 $ hg diff --nodates 53 $ hg diff --nodates