Mercurial > hg > pyhgsh
view tests/test-diffdir.out @ 1349:c6295d2a361e
More info on file merge for update --debug
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 26 Sep 2005 14:01:05 -0700 |
parents | 5a034646e472 |
children | fde8fb2cbede |
line wrap: on
line source
diff -r 3903775176ed b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r 3903775176ed b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123