chiark / gitweb /
Prevent most commands from running when there are conflicts
[stgit] / examples /
drwxr-xr-x   ..
-rw-r--r-- 3452 gitconfig
-rw-r--r-- 55 patchdescr.tmpl