merge_file(): add comment explaining behavior wrt conflict style
[git/kirr.git] / compat / vcbuild / 
treebdf37f9db4252300bc1885a18a35b914c6fc6322
drwxr-xr-x   ..
-rw-r--r-- 1906 README
drwxr-xr-x - include
drwxr-xr-x - scripts