[Bug 5099] New: Merge changes to adjacent lines

[mercurial-bugs at selenic.com]

https://bz.mercurial-scm.org/show_bug.cgi?id=5099

            Bug ID: 5099
           Summary: Merge changes to adjacent lines
           Product: Mercurial
           Version: unspecified
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: rebase
          Assignee: bugzilla at selenic.com
          Reporter: zeratul976 at hotmail.com
                CC: mercurial-devel at selenic.com

Suppose one has a file with two lines:

  int x = 42;
  int y = 43;

and suppose one person changes the first line without touching the second:

  int x = 44;
  int y = 43;

while another person changes the second line without touching the first:

  int x = 42;
  int y = 45;

Rebasing one of these commits on top of the other produces a merge conflict:

<<<<<<< dest
  int x = 42;
  int y = 45;
||||||| base
  int x = 42;
  int y = 43;
=======
  int x = 44;
  int y = 43;
>>>>>>> source

However, it seems to me that the two edits were sufficiently independent that
we can just merge them without producing a merge conflict:

  int x = 44;
  int y = 45;

Is there an option that enables this? If not, could one be added?

-- 
You are receiving this mail because:
You are on the CC list for the bug.