[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Disable merge conflicts on on non-conflicting changes to subsequent lines
From:       Marcin_Wiśnicki <mwisnicki () gmail ! com>
Date:       2012-01-31 10:55:46
Message-ID: CAC9GOO8GzvezgLH=2F735u=k+-5_1wMsZPbK4sy656dxMvCv3Q () mail ! gmail ! com
[Download RAW message or body]

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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]