merge: avoid "safer crlf" during recording of merge results
[git] / t / t9154 /
drwxr-xr-x   ..
-rw-r--r-- 2934 svn.dump