Fwd: [PATCH][detect-merge-conflicts.sh] regex incomplete

Here is the patch file.

I'm still not convinced it is exactly right. Mostly I am concerned
that I had missed a test case (e.g. 3-way merge). I was hoping for a
little discussion or confirmation from some svn heavy-weights.

I also don't like having the regular expression in 2 places in the
file, but I don't trust shell escaping a regular expression.

Thanks,

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org