Mercurial > hg
view tests/test-diffdir.out @ 5672:8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 27 Dec 2007 13:39:03 +0100 |
| parents | f80cf8b7bbd9 |
| children | c0c4c7b1e8d3 |
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!