Use git-merge in git-pull (second try).
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 60fb5b2)
-rw-r--r-- 4246 trivial-merge.txt