Mercurial > hg
view tests/test-merge6.out @ 10151:c7355a0e1f39
patch: make git diffline generation more explicit
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 29 Dec 2009 16:00:38 +0100 |
parents | a3d73b3e1f8a |
children |
line wrap: on
line source
updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../B1 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo pulling from ../A2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo