Mercurial > hg

comparison tests/test-merge-internal-tools-pattern.out @ 6550:628da4a91628

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable, fix test output
author Patrick Mezard <pmezard@gmail.com>
date Mon, 14 Apr 2008 23:28:50 +0200
parents a3668330f14a
children 9fe7e6acf525
comparison
equal deleted inserted replaced
6549:2af1b9de62b3 6550:628da4a91628
7 # branch 2: editing line 3 7 # branch 2: editing line 3
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9 created new head 9 created new head
10 # merge using internal:fail tool 10 # merge using internal:fail tool
11 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 11 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12 There are unresolved merges, you can redo the full merge using: 12 use 'hg resolve' to retry unresolved file merges
13 hg update -C 2
14 hg merge 1
15 line 1 13 line 1
16 line 2 14 line 2
17 third line 15 third line
18 M f 16 M f
19 # merge using internal:local tool 17 # merge using internal:local tool