Issue 1846: Option for diff3 style conflict markers.
Status:  New
Owner: ----
Reported by jrobert...@gmail.com, Mar 27, 2013
Our team enjoys using the "merge.conflictstyle = diff3" option in git as this makes it so much easier to resolve conflicts.

We would like to be able to more easily review merge commits with conflicts, and gerrit presents these diffs using the more traditional conflict markers.

Could we please have an option to have gerrit use diff3?