Fix merge-one-file for our-side-added/our-side-removed cases
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: 561b0fbb4a2d336faeb929380bddd6ec420d7b11)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign