{"action":"created","issue":{"url":"https://api.github.com/repos/codemirror/CodeMirror/issues/4410","repository_url":"https://api.github.com/repos/codemirror/CodeMirror","labels_url":"https://api.github.com/repos/codemirror/CodeMirror/issues/4410/labels{/name}","comments_url":"https://api.github.com/repos/codemirror/CodeMirror/issues/4410/comments","events_url":"https://api.github.com/repos/codemirror/CodeMirror/issues/4410/events","html_url":"https://github.com/codemirror/CodeMirror/issues/4410","id":192445899,"number":4410,"title":"[merge] inconsistent diff chunk calculation between left and right side","user":{"login":"takamori","id":54738,"avatar_url":"https://avatars.githubusercontent.com/u/54738?v=3","gravatar_id":"","url":"https://api.github.com/users/takamori","html_url":"https://github.com/takamori","followers_url":"https://api.github.com/users/takamori/followers","following_url":"https://api.github.com/users/takamori/following{/other_user}","gists_url":"https://api.github.com/users/takamori/gists{/gist_id}","starred_url":"https://api.github.com/users/takamori/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/takamori/subscriptions","organizations_url":"https://api.github.com/users/takamori/orgs","repos_url":"https://api.github.com/users/takamori/repos","events_url":"https://api.github.com/users/takamori/events{/privacy}","received_events_url":"https://api.github.com/users/takamori/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":4,"created_at":"2016-11-30T00:54:35Z","updated_at":"2016-12-30T11:45:53Z","closed_at":"2016-12-15T12:50:38Z","body":"When the the following 3 files are used in the 3-way merge view, inconsistent alignment is seen when connect='align' and with a missing diff on the right side when connect is not set to 'align'.\r\n\r\nLine 3 on the left corresponds to line 5 in the middle and line 3 on the right. But in the 3-way view, with connect=align, line 3 on the left is aligned with line 3 in the middle, but line 3 on the right is aligned with line 5 in the middle. Without connect=align, line 3 on the left matches to lines 3-5 in the center, and line 3-4 in the middle matches to an empty chunk just before line 3 on the right.\r\n\r\nIt seems to me that this layout is occurring because the diff isn't noticing that line 5 in the middle is the same as line 3 on both the left and right; it only sees it on the right side.\r\n\r\n[20161129-left.txt](https://github.com/codemirror/CodeMirror/files/620655/20161129-left.txt)\r\n[20161129-middle.txt](https://github.com/codemirror/CodeMirror/files/620654/20161129-middle.txt)\r\n[20161129-right.txt](https://github.com/codemirror/CodeMirror/files/620653/20161129-right.txt)\r\n"},"comment":{"url":"https://api.github.com/repos/codemirror/CodeMirror/issues/comments/269762673","html_url":"https://github.com/codemirror/CodeMirror/issues/4410#issuecomment-269762673","issue_url":"https://api.github.com/repos/codemirror/CodeMirror/issues/4410","id":269762673,"user":{"login":"jackycute","id":2639151,"avatar_url":"https://avatars.githubusercontent.com/u/2639151?v=3","gravatar_id":"","url":"https://api.github.com/users/jackycute","html_url":"https://github.com/jackycute","followers_url":"https://api.github.com/users/jackycute/followers","following_url":"https://api.github.com/users/jackycute/following{/other_user}","gists_url":"https://api.github.com/users/jackycute/gists{/gist_id}","starred_url":"https://api.github.com/users/jackycute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jackycute/subscriptions","organizations_url":"https://api.github.com/users/jackycute/orgs","repos_url":"https://api.github.com/users/jackycute/repos","events_url":"https://api.github.com/users/jackycute/events{/privacy}","received_events_url":"https://api.github.com/users/jackycute/received_events","type":"User","site_admin":false},"created_at":"2016-12-30T11:45:53Z","updated_at":"2016-12-30T11:45:53Z","body":"I know, just as a reminder 😄 "}}
{"actor":{"display_login":"jackycute"}}