mirror of
https://github.com/odoo/runbot.git
synced 2025-03-30 23:05:44 +07:00
fb45f089b0
Existing conflict style is the local default ("merge", most
likely). `diff3` is a lot more informative as it provides the common
ancestor's code for the hunk, which helps see how the two branches
diverged and thus resolve the conflict.
Even better would be zdiff3 but that's a bit too recent...
Fixes #619
2 lines
98 B
Markdown
2 lines
98 B
Markdown
IMP: use the `diff3` conflict style, should make forward port conflicts clearer and easier to fix
|