Re-add the interactive merge
[stgit] / examples /
drwxr-xr-x   ..
-rw-r--r-- 3310 gitconfig
-rw-r--r-- 55 patchdescr.tmpl