pull: allow pull to preserve merges when rebasing
[gitweb.git] / t / t4034 / ada /
drwxr-xr-x   parent (dest: t/t4034; base: 66713ef3b00933755cdeff1ae823dda7b5843640)
-rw-r--r-- 1150 expect
-rw-r--r-- 148 post
-rw-r--r-- 149 pre