Commit hook annoyance

[Joel Brobecker]

> > There  was no unresolved conflicts in the commit I tried to push.  Why
> > does the hook insist on forcing me to remove the "Conflicts:" part,
> > instead of looking for the merge-commit conflict markers?  Why do we
> > care about leaving the reference to original conflicts in the log?

Sorry - re-reading your question, I am now realizing that I was not
really answering what you asked. So, let me try it again.

I think we do care, IMO, because the information is really useless.
And also, as I said, users often don't even realize that git does
that for them. I'd rather have a little hassle right now, in favor
of sanitized revision logs forever.

I don't think it's a big hassle to have to remove them, myself.
But if the consensus to remove the check, we can enhance the hooks
to make it optional.

-- 
Joel