Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-diffdir.out @ 1881:4392ccefe432
undo edit that was accident.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 10 Mar 2006 23:25:50 -0800 |
parents | fde8fb2cbede |
children | 7544700fd931 |
rev | line source |
---|---|
536 | 1 diff -r 3903775176ed b |
2 --- /dev/null | |
3 +++ b/b | |
4 @@ -0,0 +1,1 @@ | |
5 +123 | |
6 diff -r 3903775176ed b | |
7 --- /dev/null | |
8 +++ b/b | |
9 @@ -0,0 +1,1 @@ | |
10 +123 | |
1723
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
11 diff -r 3903775176ed a |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
12 --- a/a |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
13 +++ b/a |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
14 @@ -0,0 +1,1 @@ |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
15 +foo |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
16 diff -r 3903775176ed b |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
17 --- /dev/null |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
18 +++ b/b |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
19 @@ -0,0 +1,1 @@ |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
20 +123 |