Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-after-merge.out @ 5393:c2ad1890fc53
hgk: add debug-config command to pass configuration options
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 05 Oct 2007 22:39:36 +0200 |
parents | c6682cdada2f |
children |
line wrap: on
line source
% create source repository adding a % fork source repository 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b % update source repository % merge repositories pulling from ../t2 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) % rename b as c A c R b % rename back c as b