Blame docs/merge-df_conflicts.txt
|
Packit |
ae9e2a |
Anc / Our / Thr represent the ancestor / ours / theirs side of a merge
|
|
Packit |
ae9e2a |
from branch "branch" into HEAD. Workdir represents the expected files in
|
|
Packit |
ae9e2a |
the working directory. Index represents the expected files in the index,
|
|
Packit |
ae9e2a |
with stage markers.
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
Anc Our Thr Workdir Index
|
|
Packit |
ae9e2a |
1 D D
|
|
Packit |
ae9e2a |
D/F D/F D/F [0]
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
2 D D+ D~HEAD (mod/del) D/F [0]
|
|
Packit |
ae9e2a |
D/F D/F D [1]
|
|
Packit |
ae9e2a |
D [2]
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
3 D D D/F D/F [0]
|
|
Packit |
ae9e2a |
D/F
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
4 D D+ D~branch (mod/del) D/F [0]
|
|
Packit |
ae9e2a |
D/F D/F D [1]
|
|
Packit |
ae9e2a |
D [3]
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
5 D D/F (add/add) D/F [2]
|
|
Packit |
ae9e2a |
D/F D/F [3]
|
|
Packit |
ae9e2a |
D/F
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
6 D/F D/F D D [0]
|
|
Packit |
ae9e2a |
D
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
7 D/F D/F+ D/F (mod/del) D/F [1]
|
|
Packit |
ae9e2a |
D D~branch (fil/dir) D/F [2]
|
|
Packit |
ae9e2a |
D [3]
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
8 D/F D/F D D [0]
|
|
Packit |
ae9e2a |
D
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
9 D/F D/F+ D/F (mod/del) D/F [1]
|
|
Packit |
ae9e2a |
D D~HEAD (fil/dir) D [2]
|
|
Packit |
ae9e2a |
D/F [3]
|
|
Packit |
ae9e2a |
|
|
Packit |
ae9e2a |
10 D/F D/F (fil/dir) D/F [0]
|
|
Packit |
ae9e2a |
D D~HEAD D [2]
|
|
Packit |
ae9e2a |
D
|