diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-04-01 22:16:21 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-04-30 15:31:31 -0500 |
| commit | bec65a5e994bc4701216c9ca2c7dae83770b3edc (patch) | |
| tree | 1e941e76b80245dcfb4853d7c6dc231c7aab7699 /docs/merge-df_conflicts.txt | |
| parent | 5e2261aca86310aa180eab5ccdc345b1539b024d (diff) | |
| download | libgit2-bec65a5e994bc4701216c9ca2c7dae83770b3edc.tar.gz | |
merge!
Diffstat (limited to 'docs/merge-df_conflicts.txt')
| -rw-r--r-- | docs/merge-df_conflicts.txt | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/docs/merge-df_conflicts.txt b/docs/merge-df_conflicts.txt new file mode 100644 index 000000000..09780ee2d --- /dev/null +++ b/docs/merge-df_conflicts.txt @@ -0,0 +1,41 @@ +Anc / Our / Thr represent the ancestor / ours / theirs side of a merge +from branch "branch" into HEAD. Workdir represents the expected files in +the working directory. Index represents the expected files in the index, +with stage markers. + + Anc Our Thr Workdir Index +1 D D + D/F D/F D/F [0] + +2 D D+ D~HEAD (mod/del) D/F [0] + D/F D/F D [1] + D [2] + +3 D D D/F D/F [0] + D/F + +4 D D+ D~branch (mod/del) D/F [0] + D/F D/F D [1] + D [3] + +5 D D/F (add/add) D/F [2] + D/F D/F [3] + D/F + +6 D/F D/F D D [0] + D + +7 D/F D/F+ D/F (mod/del) D/F [1] + D D~branch (fil/dir) D/F [2] + D [3] + +8 D/F D/F D D [0] + D + +9 D/F D/F+ D/F (mod/del) D/F [1] + D D~HEAD (fil/dir) D [2] + D/F [3] + +10 D/F D/F (fil/dir) D/F [0] + D D~HEAD D [2] + D |