equal
deleted
inserted
replaced
1 %%% should show a removed and b added |
1 %%% should show a removed and b added |
2 A b |
2 A b |
3 R a |
3 R a |
4 reverting... |
4 reverting... |
5 saving current version of b as b.bak |
5 saving current version of b as b.orig |
6 forgetting b |
6 forgetting b |
7 undeleting a |
7 undeleting a |
8 %%% should show b unknown and a back to normal |
8 %%% should show b unknown and a back to normal |
9 ? b |
9 ? b |
10 ? b.bak |
10 ? b.orig |
11 merging a |
11 merging a |
12 %%% should show foo-b |
12 %%% should show foo-b |
13 foo-b |
13 foo-b |
14 %%% should show a removed and b added |
14 %%% should show a removed and b added |
15 A b |
15 A b |
16 R a |
16 R a |
17 ? b.bak |
17 ? b.orig |
18 reverting... |
18 reverting... |
19 forgetting b |
19 forgetting b |
20 undeleting a |
20 undeleting a |
21 %%% should show b unknown and a marked modified (merged) |
21 %%% should show b unknown and a marked modified (merged) |
22 ? b |
22 ? b |
23 ? b.bak |
23 ? b.orig |
24 %%% should show foo-b |
24 %%% should show foo-b |
25 foo-b |
25 foo-b |