checkout: use --aggressive when running a 3-way merge (-m).
[git.git] / contrib /
drwxr-xr-x   ..
-rw-r--r-- 2114 README
drwxr-xr-x - emacs
drwxr-xr-x - git-svn
drwxr-xr-x - gitview