Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 1637:3b1b44b917f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new bdiff based unidiff generation.
author mason@suse.com
date Tue, 24 Jan 2006 15:02:10 +1300
parents db10b7114de0
children dee55c4a4963
comparison
equal deleted inserted replaced
1636:7da32bb3d1d3 1637:3b1b44b917f4
1 adding a 1 adding a
2 diff -r c19d34741b0a a 2 diff -r c19d34741b0a a
3 --- a/a 3 --- a/a
4 +++ b/a 4 +++ b/a
5 @@ -1,1 +1,1 @@ 5 @@ -1,1 +1,1 @@ a
6 -a 6 -a
7 +abc 7 +abc
8 adding b 8 adding b
9 M a 9 M a
10 resolving manifests 10 resolving manifests
45 45
46 46
47 diff -r 1e71731e6fbb a 47 diff -r 1e71731e6fbb a
48 --- a/a 48 --- a/a
49 +++ b/a 49 +++ b/a
50 @@ -1,1 +1,1 @@ 50 @@ -1,1 +1,1 @@ a2
51 -a2 51 -a2
52 +abc 52 +abc