Don't always use git-merge-recursive because of speed
[stgit] / examples /
drwxr-xr-x   ..
-rw-r--r-- 2123 gitconfig
-rw-r--r-- 55 patchdescr.tmpl