My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 1846: Option for diff3 style conflict markers.
4 people starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
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?
Sign in to add a comment

Powered by Google Project Hosting