1 Anc / Our / Thr represent the ancestor / ours / theirs side of a merge
2 from branch "branch" into HEAD. Workdir represents the expected files in
3 the working directory. Index represents the expected files in the index,
6 Anc Our Thr Workdir Index
10 2 D D+ D~HEAD (mod/del) D/F [0]
17 4 D D+ D~branch (mod/del) D/F [0]
21 5 D D/F (add/add) D/F [2]
28 7 D/F D/F+ D/F (mod/del) D/F [1]
29 D D~branch (fil/dir) D/F [2]
35 9 D/F D/F+ D/F (mod/del) D/F [1]
36 D D~HEAD (fil/dir) D [2]
39 10 D/F D/F (fil/dir) D/F [0]