Disable merge conflicts on on non-conflicting changes to subsequent lines

From: Marcin Wiśnicki <hidden>
Date: 2016-06-15 22:52:54

If two subsequent lines are changed in different branches, merging
will result in conflict event if there isn't any.
Invoking merge tool will mark file as resolved automatically.

Is there a way to disable this behavior ? I want the merge to happen
automatically if possible.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help