merge: avoid "safer crlf" during recording of merge results
[git] / t / t4034 / html /
drwxr-xr-x   ..
-rw-r--r-- 459 expect
-rw-r--r-- 116 post
-rw-r--r-- 79 pre