Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 803:3d47e7fc33a3
Use tabs instead of spaces where apropriate.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 21:34:41 +0100 |
parents | 1f9ec150a476 |
children | 8f5637f0a0c0 |
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 commit -m commit #3 -d 0 0