Pass a string rather than an exception object in gitmergeonefile
[stgit/ydirson.git] / examples / 
tree35a4fc93b879a5d718b7439cdd15f3a21cf238ed
drwxr-xr-x   ..
-rw-r--r-- 3123 gitconfig
-rw-r--r-- 55 patchdescr.tmpl