pull: make pull.ff=true override merge.ff
[git.git] / t / t8005 / 
tree7266b6c1442333c12bf95836f3202a91601efa1f
drwxr-xr-x   ..
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt