chiark / gitweb /
Use the output from merge-recursive to list conflicts
[stgit] / examples /
drwxr-xr-x   ..
-rw-r--r-- 3606 gitconfig
-rw-r--r-- 55 patchdescr.tmpl