equal
deleted
inserted
replaced
50 -a |
50 -a |
51 |
51 |
52 not removing a: file has been marked for add (use -f to force removal) |
52 not removing a: file has been marked for add (use -f to force removal) |
53 adding a |
53 adding a |
54 adding b |
54 adding b |
55 adding c |
55 adding c/d |
56 not removing b: file is modified (use -f to force removal) |
56 not removing b: file is modified (use -f to force removal) |
57 R b |
57 R b |
58 R c |
58 R c/d |
59 c |
59 d |
|
60 undeleting c/d |
60 R b |
61 R b |
61 removing c |
|
62 R b |
62 R b |
63 R c |
63 removing c/d |
|
64 R b |
|
65 R c/d |
64 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
66 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |