From: Marcin Wiśnicki <mwisnicki@gmail.com>
Date: Tue, 31 Jan 2012 10:55:46 GMT
Subject: Disable merge conflicts on on non-conflicting changes to subsequent lines
Message-ID: <CAC9GOO8GzvezgLH=2F735u=k+-5_1wMsZPbK4sy656dxMvCv3Q@mail.gmail.com>

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.