Mercurial > hg

comparison tests/test-merge-types.t @ 16372:709924be3d04 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew
author Matt Mackall <mpm@selenic.com>
date Fri, 06 Apr 2012 15:17:50 -0500
parents cb1475e7e5a2
children 722fd97f6645
comparison
equal deleted inserted replaced
16369:e14d7805845d 16372:709924be3d04
87 overwrite: False, partial: False 87 overwrite: False, partial: False
88 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f 88 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
89 a: versions differ -> m 89 a: versions differ -> m
90 preserving a for resolve of a 90 preserving a for resolve of a
91 updating: a 1/1 files (100.00%) 91 updating: a 1/1 files (100.00%)
92 couldn't find merge tool hgmerge 92 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
93 picked tool 'internal:prompt' for a (binary False symlink True) 93 picked tool 'internal:prompt' for a (binary False symlink True)
94 no tool found to merge a 94 no tool found to merge a
95 keep (l)ocal or take (o)ther? l 95 keep (l)ocal or take (o)ther? l
96 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 96 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
97 $ hg diff --git 97 $ hg diff --git