git-merge-recursive: learn to honor merge.conflictstyle
[git] / contrib / thunderbird-patch-inline /
drwxr-xr-x   ..
-rw-r--r-- 723 README
-rwxr-xr-x 1402 appp.sh