Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir.out @ 4317:66249be9aa23
test-bad-pull: try to avoid timing-related failures
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 07 Apr 2007 04:27:55 -0300 |
parents | f80cf8b7bbd9 |
children |
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 abort: Ambiguous identifier! abort: Ambiguous identifier!