chiark / gitweb /
Added a test case to check what happens when push finds a conflict
[stgit] / examples /
drwxr-xr-x   ..
-rw-r--r-- 3606 gitconfig
-rw-r--r-- 55 patchdescr.tmpl