Mercurial > hg > gitweb
view tests/test-diffdir.out @ 3162:a9e75b371315
merge: move partial filtering out of manifest merge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 26 Sep 2006 16:21:52 -0500 |
parents | 7544700fd931 |
children | 000d122071b5 |
line wrap: on
line source
diff -r acd8075edac9 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r acd8075edac9 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r acd8075edac9 a --- a/a +++ b/a @@ -0,0 +1,1 @@ +foo diff -r acd8075edac9 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123