fix git merge not creating MERGE_HEAD, etc when no unresolved conflicts.  added more help when running merge.  fixed porcelain call that used repo obj instead of path.
fix git merge not creating MERGE_HEAD, etc when no unresolved conflicts.  added more help when running merge.  fixed porcelain call that used repo obj instead of path.
cclauss/stash,jsbain/stash,ywangd/stash,ywangd/stash,jsbain/stash,cclauss/stash