Fix bogus error message from merge-recursive error path
[git/dscho.git] / contrib / hooks / 
treef42f238033bdbe33066fbc9b0867c39cc98267fb
drwxr-xr-x   ..
-rw-r--r-- 17178 post-receieve-email