checkout: fix interaction between --conflict and --mergepw/checkout-conflict-errorfix
[git/gitster.git] / t / t4020 / 
tree993a871b7f83a2bdcdd2281e7c4221694f208ee7
drwxr-xr-x   ..
-rw-r--r-- 116 diff.NUL