Teach 'git merge' and 'git pull' the option --ff-only
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: 134748353b2a71a34f899c9b1326ccf7ae082412)
-rw-r--r-- 116 diff.NUL