Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 4195:b5d1eaade333
Merge a bunch of matcher and locate fixes.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 10 Mar 2007 23:21:33 -0300 |
parents | 4574a8cb080f |
children | f80cf8b7bbd9 |
line wrap: on
line source
diff -r 4da5fa99f904 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r 4da5fa99f904 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 diff -r 4da5fa99f904 a --- a/a +++ b/a @@ -0,0 +1,1 @@ +foo diff -r 4da5fa99f904 b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +123 abort: Ambiguous identifier! abort: Ambiguous identifier!