git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / howto /
drwxr-xr-x   parent (dest: Documentation; base: 70a3f89733a4cd21631690ba980598fea2249067)
-rw-r--r-- 10093 maintain-git.txt
-rw-r--r-- 2628 rebase-and-edit.txt
-rw-r--r-- 6323 rebase-from-internal-branch.txt
-rw-r--r-- 3042 rebuild-from-update-hook.txt
-rw-r--r-- 5040 recover-corrupted-blob-object.txt
-rw-r--r-- 7936 revert-branch-rebase.txt
-rw-r--r-- 3266 separating-topic-branches.txt
-rw-r--r-- 8293 setup-git-server-over-http.txt
-rw-r--r-- 6091 update-hook-example.txt
-rw-r--r-- 2081 use-git-daemon.txt
-rw-r--r-- 3000 using-merge-subtree.txt