{"action":"created","issue":{"url":"https://api.github.com/repos/magit/magit/issues/1893","labels_url":"https://api.github.com/repos/magit/magit/issues/1893/labels{/name}","comments_url":"https://api.github.com/repos/magit/magit/issues/1893/comments","events_url":"https://api.github.com/repos/magit/magit/issues/1893/events","html_url":"https://github.com/magit/magit/issues/1893","id":84192547,"number":1893,"title":"ediff3 to resolve merge conflicts","user":{"login":"To1ne","id":121621,"avatar_url":"https://avatars.githubusercontent.com/u/121621?v=3","gravatar_id":"","url":"https://api.github.com/users/To1ne","html_url":"https://github.com/To1ne","followers_url":"https://api.github.com/users/To1ne/followers","following_url":"https://api.github.com/users/To1ne/following{/other_user}","gists_url":"https://api.github.com/users/To1ne/gists{/gist_id}","starred_url":"https://api.github.com/users/To1ne/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/To1ne/subscriptions","organizations_url":"https://api.github.com/users/To1ne/orgs","repos_url":"https://api.github.com/users/To1ne/repos","events_url":"https://api.github.com/users/To1ne/events{/privacy}","received_events_url":"https://api.github.com/users/To1ne/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/magit/magit/labels/32%20obsolete","name":"32 obsolete","color":"d4c5f9"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":10,"created_at":"2015-06-02T20:17:02Z","updated_at":"2015-08-05T23:00:36Z","closed_at":null,"body":"Feature request:\r\nUse `ediff3` to resolve merge conflicts. Emacs would look like something like this:\r\n\r\n    |their|base|ours|\r\n    |---------------|\r\n    |    result     |"},"comment":{"url":"https://api.github.com/repos/magit/magit/issues/comments/128176107","html_url":"https://github.com/magit/magit/issues/1893#issuecomment-128176107","issue_url":"https://api.github.com/repos/magit/magit/issues/1893","id":128176107,"user":{"login":"kyleam","id":1297788,"avatar_url":"https://avatars.githubusercontent.com/u/1297788?v=3","gravatar_id":"","url":"https://api.github.com/users/kyleam","html_url":"https://github.com/kyleam","followers_url":"https://api.github.com/users/kyleam/followers","following_url":"https://api.github.com/users/kyleam/following{/other_user}","gists_url":"https://api.github.com/users/kyleam/gists{/gist_id}","starred_url":"https://api.github.com/users/kyleam/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kyleam/subscriptions","organizations_url":"https://api.github.com/users/kyleam/orgs","repos_url":"https://api.github.com/users/kyleam/repos","events_url":"https://api.github.com/users/kyleam/events{/privacy}","received_events_url":"https://api.github.com/users/kyleam/received_events","type":"User","site_admin":false},"created_at":"2015-08-05T23:00:36Z","updated_at":"2015-08-05T23:00:36Z","body":"I don't think there's a builtin way in Ediff to get the 4-panel view you\nwant.  ediff-merge-files-with-ancestor doesn't display the ancestor\nbuffer, but you can view it with '/'.\n\n    (info \"(ediff)Merging and diff3\")\n\n    Although the ancestor buffer is normally invisible, Ediff maintains\n    difference regions there and advances the current difference region\n    accordingly.  All highlighting of difference regions is provided in\n    the ancestor buffer, except for the fine differences.  Therefore, if\n    desired, the user can put the ancestor buffer in a separate frame\n    and watch it there.  However, on a TTY, only one frame can be\n    visible at any given time, and Ediff doesn’t support any\n    single-frame window configuration where all buffers, including the\n    ancestor buffer, would be visible.  However, the ancestor buffer can\n    be displayed by typing ‘/’ to the control window.  (Type ‘C-l’ to\n    hide it again.)\n\nHere is the current state of things in Magit.  If you have conflicts,\nmagit-ediff-dwim calls magit-ediff-resolve, which in turn calls\nsmerge-ediff.  smerge-ediff decides whether to call ediff-merge-buffers\nor ediff-merge-buffers-with-ancestor based on the conflict style of the\nbuffer.  If you have Git's merge.conflictStyle set to 'diff3',\nediff-merge-buffers-with-ancestor will be called, and you can use '/' to\nsee the ancestor buffer.\n"}}