ls-files: --others should not say unmerged paths are unknown.
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: fcbc3083e37f3c025d85d7b2c8a1c53d07a81fac)
-rw-r--r-- 4246 trivial-merge.txt