Documentation: -merge and -pull: describe merge strategies.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 3746501664e3fcf6c44080cb599b50bf9cbea2be)
-rw-r--r-- 4246 trivial-merge.txt