Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 2178:00205fe76993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children 4e35843b2683
comparison
equal deleted inserted replaced
2177:6886bc0b77af 2178:00205fe76993
1 adding a 1 adding a
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 diff -r 33aaa84a386b a 4 diff -r 33aaa84a386b a
3 --- a/a 5 --- a/a
4 +++ b/a 6 +++ b/a
5 @@ -1,1 +1,1 @@ a 7 @@ -1,1 +1,1 @@ a
6 -a 8 -a
83 --- a/a 85 --- a/a
84 +++ b/a 86 +++ b/a
85 @@ -1,1 +1,1 @@ a2 87 @@ -1,1 +1,1 @@ a2
86 -a2 88 -a2
87 +abc 89 +abc
90 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
88 adding b 91 adding b
89 M a 92 M a
90 changeset: 1:802f095af299 93 changeset: 1:802f095af299
91 user: test 94 user: test
92 date: Mon Jan 12 13:46:40 1970 +0000 95 date: Mon Jan 12 13:46:40 1970 +0000
141 requesting all changes 144 requesting all changes
142 adding changesets 145 adding changesets
143 adding manifests 146 adding manifests
144 adding file changes 147 adding file changes
145 added 1 changesets with 1 changes to 1 files 148 added 1 changesets with 1 changes to 1 files
149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved