Use git-merge-file in git-merge-one-file, too
[git/gitweb.git] / contrib / 
treebb76d4d8c88ce9dadd69e9463e7fda7a353dfcd4
drwxr-xr-x   ..
-rw-r--r-- 2114 README
drwxr-xr-x - colordiff
drwxr-xr-x - completion
drwxr-xr-x - emacs
drwxr-xr-x - gitview
-rw-r--r-- 1484 mailmap.linux
-rw-r--r-- 770 remotes2config.sh
drwxr-xr-x - vim