Mercurial > hg
view tests/test-merge-internal-tools-pattern.out @ 8063:ee8d9b93b316
convert/p4: win32 fixes
* cmd.exe does not know single quotes
* win32 does not like trailing whitespace very much. Trade test coverage for
maintenance time and drop the trailing whitespaces tests.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 13 Apr 2009 16:15:45 +0200 |
parents | 9fe7e6acf525 |
children | b2310903c462 |
line wrap: on
line source
# initial file contents adding f line 1 line 2 line 3 # branch 1: editing line 1 # branch 2: editing line 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head # merge using internal:fail tool 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon line 1 line 2 third line M f # merge using internal:local tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) line 1 line 2 third line M f # merge using internal:other tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) first line line 2 line 3 M f # merge using default tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging f 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) first line line 2 third line M f