merge_file(): add comment explaining behavior wrt conflict style
[git/mjg.git] / contrib / vim / 
tree1320cf12c52e60dec5dee16f735c517bae35e429
drwxr-xr-x   ..
-rw-r--r-- 1229 README