{"thread":{"id":"29487","subject":"Disable merge conflicts on on non-conflicting changes to subsequent lines","startedAt":"2012-01-31T10:55:46Z","lastAt":"2012-01-31T10:55:46Z","messageCount":1,"participants":["Marcin Wiśnicki"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"183411","messageId":"CAC9GOO8GzvezgLH=2F735u=k+-5_1wMsZPbK4sy656dxMvCv3Q@mail.gmail.com","threadId":"29487","inReplyTo":null,"subject":"Disable merge conflicts on on non-conflicting changes to subsequent lines","fromName":"Marcin Wiśnicki","fromEmail":"mwisnicki@gmail.com","sentAt":"2012-01-31T10:55:46Z","receivedAt":"2012-01-31T10:55:46Z","isPatch":false,"sender":{"key":"mwisnicki@gmail.com","avatar":"https://gravatar.com/avatar/6bc6cce46e549217fe39b05ac03acb4f5755154d6752ff65b580783365ad3e50?d=mp&s=160"},"body":"If two subsequent lines are changed in different branches, merging\nwill result in conflict event if there isn't any.\nInvoking merge tool will mark file as resolved automatically.\n\nIs there a way to disable this behavior ? I want the merge to happen\nautomatically if possible.\n"}]}