mergetool: Make ECMerge use the settings as specified by the user in the GUI
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: f4e9f786f737e55fd4ea06dbb25b14dd32b872c1)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign