merge_file(): add comment explaining behavior wrt conflict style
[git/dscho.git] / contrib / thunderbird-patch-inline / 
treeddd35e346144818bf5c13cbd69da8125fbb6c2c5
drwxr-xr-x   ..
-rw-r--r-- 725 README
-rwxr-xr-x 1402 appp.sh