merge-one-file: use common as base, instead of emptiness.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: cb93c19)
-rw-r--r-- 4246 trivial-merge.txt