Mercurial > hg
view tests/test-merge2.out @ 874:d4cb383e7de7
Merge Chris's changes with mine.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 12 Aug 2005 09:58:35 -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 b + hg commit -m commit #2 -d 0 0 + 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 commit -A -m commit #2 -d 0 0 adding 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 remove b + hg update 0 + hg commit -A -m commit #2 -d 0 0 adding b