Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 829:764b0350acb8
Shortened hgmerge a little bit.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 04 Aug 2005 17:16:41 +0100 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add a + hg ci -m a -d 0 0 + hg add b + hg diff diff -r 3903775176ed b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 + hg diff -r tip diff -r 3903775176ed b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123