Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-diffdir.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | af7e21f3b2d9 1f9ec150a476 |
children | 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
788:64d2a558c943 | 808:8f5637f0a0c0 |
---|---|
1 + hg init | |
2 + hg add a | |
3 + hg ci -m a -d 0 0 | |
4 + hg add b | |
5 + hg diff | |
1 diff -r 3903775176ed b | 6 diff -r 3903775176ed b |
2 --- /dev/null | 7 --- /dev/null |
3 +++ b/b | 8 +++ b/b |
4 @@ -0,0 +1,1 @@ | 9 @@ -0,0 +1,1 @@ |
5 +123 | 10 +123 |
11 + hg diff -r tip | |
6 diff -r 3903775176ed b | 12 diff -r 3903775176ed b |
7 --- /dev/null | 13 --- /dev/null |
8 +++ b/b | 14 +++ b/b |
9 @@ -0,0 +1,1 @@ | 15 @@ -0,0 +1,1 @@ |
10 +123 | 16 +123 |