Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-issue612.out @ 4822:f48290864625
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 16:17:01 -0500 |
parents | 9797124581c9 |
children |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/tests/test-issue612.out @@ -0,0 +1,11 @@ +adding src/a.c +copying src/a.c to source/a.c +removing src/a.c +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +? src/a.o +merging src/a.c and source/a.c +1 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +M source/a.c +R src/a.c +? source/a.o