Mercurial > hg
view tests/test-merge1.out @ 881:16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Wed, 10 Aug 2005 12:35:25 -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