merge with /dev/null as base, instead of punting O==empty case
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: f7d24bbefb06c40f7738f471dda561ab45496d24)
-rw-r--r-- 4246 trivial-merge.txt