Teach 'git merge' and 'git pull' the option --ff-only
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 134748353b2a71a34f899c9b1326ccf7ae082412)
-rw-r--r-- 90 expect
-rw-r--r-- 163 patch1.patch
-rw-r--r-- 112 patch2.patch
-rw-r--r-- 131 patch3.patch
-rw-r--r-- 112 patch4.patch
-rw-r--r-- 117 patch5.patch