diff tests/test-issue612.out @ 4819:9797124581c9

merge: fix adding untracked files on directory rename (issue612)

Fix from Brendan
Added test case

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue612.out	Thu Jul 05 16:01:07 2007 -0500
@@ -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