Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 886:509de8ab6f31
Fix walk path handling on Windows
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 12 Aug 2005 15:06:52 -0800 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg add c + hg commit -m commit #2 -d 0 0 + hg update -m 1 + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg add c + hg commit -m commit #2 -d 0 0 + hg update -m 1 merging for b merging b + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg commit -m commit #2 -d 0 0 + hg update 1 + hg add c + hg commit -m commit #3 -d 0 0 This is file b1 + hg update -m 2 merging for b merging b + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg commit -m commit #2 -d 0 0 + hg update 1 + hg add c + hg commit -m commit #3 -d 0 0 + hg update -m 2 merging for b merging b