Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 2178:00205fe76993
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 02 May 2006 14:38:32 -0700 |
parents | b2ae81a7df29 |
children | 4e35843b2683 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -1,4 +1,6 @@ adding a +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff -r 33aaa84a386b a --- a/a +++ b/a @@ -85,6 +87,7 @@ diff -r 802f095af299 a @@ -1,1 +1,1 @@ a2 -a2 +abc +1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b M a changeset: 1:802f095af299 @@ -143,3 +146,4 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved