docs/merge-df_conflicts.txt

   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,
   4 with stage markers.
   5
   6     Anc  Our  Thr    Workdir             Index
   7 1   D    D
   8                D/F   D/F                 D/F [0]
   9
  10 2   D    D+          D~HEAD (mod/del)    D/F [0]
  11                D/F   D/F                 D [1]
  12                                          D [2]
  13
  14 3   D          D     D/F                 D/F [0]
  15          D/F
  16
  17 4   D          D+    D~branch (mod/del)  D/F [0]
  18          D/F         D/F                 D [1]
  19                                          D [3]
  20
  21 5   D                D/F (add/add)       D/F [2]
  22          D/F                             D/F [3]
  23                D/F
  24
  25 6   D/F  D/F         D                   D [0]
  26                D
  27
  28 7   D/F  D/F+        D/F (mod/del)       D/F [1]
  29                D     D~branch (fil/dir)  D/F [2]
  30                                          D [3]
  31
  32 8   D/F        D/F   D                   D [0]
  33          D
  34
  35 9   D/F        D/F+  D/F (mod/del)       D/F [1]
  36          D           D~HEAD (fil/dir)    D [2]
  37                                          D/F [3]
  38
  39 10  D/F              D/F (fil/dir)       D/F [0]
  40          D           D~HEAD              D [2]
  41                D