{"action":"created","issue":{"url":"https://api.github.com/repos/so-fancy/diff-so-fancy/issues/126","repository_url":"https://api.github.com/repos/so-fancy/diff-so-fancy","labels_url":"https://api.github.com/repos/so-fancy/diff-so-fancy/issues/126/labels{/name}","comments_url":"https://api.github.com/repos/so-fancy/diff-so-fancy/issues/126/comments","events_url":"https://api.github.com/repos/so-fancy/diff-so-fancy/issues/126/events","html_url":"https://github.com/so-fancy/diff-so-fancy/issues/126","id":139712940,"number":126,"title":"Support 3-way merge commits","user":{"login":"paulirish","id":39191,"avatar_url":"https://avatars.githubusercontent.com/u/39191?v=3","gravatar_id":"","url":"https://api.github.com/users/paulirish","html_url":"https://github.com/paulirish","followers_url":"https://api.github.com/users/paulirish/followers","following_url":"https://api.github.com/users/paulirish/following{/other_user}","gists_url":"https://api.github.com/users/paulirish/gists{/gist_id}","starred_url":"https://api.github.com/users/paulirish/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/paulirish/subscriptions","organizations_url":"https://api.github.com/users/paulirish/orgs","repos_url":"https://api.github.com/users/paulirish/repos","events_url":"https://api.github.com/users/paulirish/events{/privacy}","received_events_url":"https://api.github.com/users/paulirish/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":{"url":"https://api.github.com/repos/so-fancy/diff-so-fancy/milestones/1","html_url":"https://github.com/so-fancy/diff-so-fancy/milestones/2.0","labels_url":"https://api.github.com/repos/so-fancy/diff-so-fancy/milestones/1/labels","id":1635290,"number":1,"title":"2.0","description":"","creator":{"login":"paulirish","id":39191,"avatar_url":"https://avatars.githubusercontent.com/u/39191?v=3","gravatar_id":"","url":"https://api.github.com/users/paulirish","html_url":"https://github.com/paulirish","followers_url":"https://api.github.com/users/paulirish/followers","following_url":"https://api.github.com/users/paulirish/following{/other_user}","gists_url":"https://api.github.com/users/paulirish/gists{/gist_id}","starred_url":"https://api.github.com/users/paulirish/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/paulirish/subscriptions","organizations_url":"https://api.github.com/users/paulirish/orgs","repos_url":"https://api.github.com/users/paulirish/repos","events_url":"https://api.github.com/users/paulirish/events{/privacy}","received_events_url":"https://api.github.com/users/paulirish/received_events","type":"User","site_admin":false},"open_issues":1,"closed_issues":0,"state":"open","created_at":"2016-03-09T21:42:13Z","updated_at":"2016-03-09T21:57:28Z","due_on":null,"closed_at":null},"comments":2,"created_at":"2016-03-09T21:57:28Z","updated_at":"2016-03-10T12:21:34Z","closed_at":null,"body":"Currently DSF doesn't correctly format output when viewing 3-way merge commits. There shouldn't be errors, but we misformat the diff, as there can be an extra layer of indentation.\r\n\r\nExample: \r\n<a href=\"https://cloud.githubusercontent.com/assets/39191/13648024/a3fbad72-e5eb-11e5-8921-7dc211648209.png\"><img src=\"https://cloud.githubusercontent.com/assets/39191/13648024/a3fbad72-e5eb-11e5-8921-7dc211648209.png\" height=400></a>\r\n\r\n## Impact\r\n* **`git show` on merge commits**\r\n * example: `git show 74804e377` in the DSF repo.\r\n* **`git diff` across a merge commit (sometimes)**\r\n  * example: ` git diff 91bc769c02  59aebbd379 `  or just `git diff 59aebbd379` \r\n* **NOT `git diff` on (unstaged) changes**\r\n  * afaik, impossible. So our exposure to this bug is limited.\r\n\r\nWe discussed this a bit more over in scott's fork: https://github.com/scottchiefbaker/diff-so-fancy/pull/1#issuecomment-194506753 \r\n\r\n06b9421b814d80216d7f8a74621aba4b4979a1db provides a test we can use once we're ready to fix this.\r\n\r\n<hr>\r\n\r\nCurrently, we've decided to defer and address this bug later. "},"comment":{"url":"https://api.github.com/repos/so-fancy/diff-so-fancy/issues/comments/194817625","html_url":"https://github.com/so-fancy/diff-so-fancy/issues/126#issuecomment-194817625","issue_url":"https://api.github.com/repos/so-fancy/diff-so-fancy/issues/126","id":194817625,"user":{"login":"lode","id":511245,"avatar_url":"https://avatars.githubusercontent.com/u/511245?v=3","gravatar_id":"","url":"https://api.github.com/users/lode","html_url":"https://github.com/lode","followers_url":"https://api.github.com/users/lode/followers","following_url":"https://api.github.com/users/lode/following{/other_user}","gists_url":"https://api.github.com/users/lode/gists{/gist_id}","starred_url":"https://api.github.com/users/lode/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lode/subscriptions","organizations_url":"https://api.github.com/users/lode/orgs","repos_url":"https://api.github.com/users/lode/repos","events_url":"https://api.github.com/users/lode/events{/privacy}","received_events_url":"https://api.github.com/users/lode/received_events","type":"User","site_admin":false},"created_at":"2016-03-10T12:21:34Z","updated_at":"2016-03-10T12:21:34Z","body":"But how do you want to solve it? It is not really nice to remove the +/- signs as we do with normal diffs.\r\nMaybe DSF should even revert to removing them at all for n-way merges? So by default they are hidden, and for n-way merges, all are shown as normal."}}