Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
[git] / t / t4034 / ruby /
drwxr-xr-x   ..
-rw-r--r-- 1989 expect
-rw-r--r-- 234 post
-rw-r--r-- 228 pre