equal
deleted
inserted
replaced
4 reverting... |
4 reverting... |
5 undeleting a |
5 undeleting a |
6 forgetting b |
6 forgetting b |
7 %%% should show b unknown and a back to normal |
7 %%% should show b unknown and a back to normal |
8 ? b |
8 ? b |
|
9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9 merging a |
11 merging a |
|
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
13 (branch merge, don't forget to commit) |
10 %%% should show foo-b |
14 %%% should show foo-b |
11 foo-b |
15 foo-b |
12 %%% should show a removed and b added |
16 %%% should show a removed and b added |
13 A b |
17 A b |
14 R a |
18 R a |