Handle really trivial case inside git-merge.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: f9d72413bcbf33ced45f12e17ef156abd73963f6)
-rw-r--r-- 4246 trivial-merge.txt