1 %%% should show a removed and b added

     2 A b

     3 R a

     4 reverting...

     5 %%% should show b unknown and a back to normal

     6 ? b

     7 merging a

     8 %%% should show foo-b

     9 foo-b

    10 %%% should show a removed and b added

    11 A b

    12 R a

    13 reverting...

    14 %%% should show b unknown and a marked modified (merged)

    15 ? b

    16 %%% should show foo-b

    17 foo-b