{"action":"created","issue":{"url":"https://api.github.com/repos/rhysd/conflict-marker.vim/issues/2","labels_url":"https://api.github.com/repos/rhysd/conflict-marker.vim/issues/2/labels{/name}","comments_url":"https://api.github.com/repos/rhysd/conflict-marker.vim/issues/2/comments","events_url":"https://api.github.com/repos/rhysd/conflict-marker.vim/issues/2/events","html_url":"https://github.com/rhysd/conflict-marker.vim/issues/2","id":121547622,"number":2,"title":"Support for Parent","user":{"login":"spf13","id":173412,"avatar_url":"https://avatars.githubusercontent.com/u/173412?v=3","gravatar_id":"","url":"https://api.github.com/users/spf13","html_url":"https://github.com/spf13","followers_url":"https://api.github.com/users/spf13/followers","following_url":"https://api.github.com/users/spf13/following{/other_user}","gists_url":"https://api.github.com/users/spf13/gists{/gist_id}","starred_url":"https://api.github.com/users/spf13/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/spf13/subscriptions","organizations_url":"https://api.github.com/users/spf13/orgs","repos_url":"https://api.github.com/users/spf13/repos","events_url":"https://api.github.com/users/spf13/events{/privacy}","received_events_url":"https://api.github.com/users/spf13/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/rhysd/conflict-marker.vim/labels/enhancement","name":"enhancement","color":"84b6eb"}],"state":"open","locked":false,"assignee":{"login":"rhysd","id":823277,"avatar_url":"https://avatars.githubusercontent.com/u/823277?v=3","gravatar_id":"","url":"https://api.github.com/users/rhysd","html_url":"https://github.com/rhysd","followers_url":"https://api.github.com/users/rhysd/followers","following_url":"https://api.github.com/users/rhysd/following{/other_user}","gists_url":"https://api.github.com/users/rhysd/gists{/gist_id}","starred_url":"https://api.github.com/users/rhysd/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rhysd/subscriptions","organizations_url":"https://api.github.com/users/rhysd/orgs","repos_url":"https://api.github.com/users/rhysd/repos","events_url":"https://api.github.com/users/rhysd/events{/privacy}","received_events_url":"https://api.github.com/users/rhysd/received_events","type":"User","site_admin":false},"milestone":null,"comments":3,"created_at":"2015-12-10T18:22:21Z","updated_at":"2016-01-01T20:03:40Z","closed_at":null,"body":"A feature of git is that it can also create conflict markers for the parent. These are very useful, but unfortunately not supported by conflict-marker.vim yet. \r\n\r\n"},"comment":{"url":"https://api.github.com/repos/rhysd/conflict-marker.vim/issues/comments/168335005","html_url":"https://github.com/rhysd/conflict-marker.vim/issues/2#issuecomment-168335005","issue_url":"https://api.github.com/repos/rhysd/conflict-marker.vim/issues/2","id":168335005,"user":{"login":"spf13","id":173412,"avatar_url":"https://avatars.githubusercontent.com/u/173412?v=3","gravatar_id":"","url":"https://api.github.com/users/spf13","html_url":"https://github.com/spf13","followers_url":"https://api.github.com/users/spf13/followers","following_url":"https://api.github.com/users/spf13/following{/other_user}","gists_url":"https://api.github.com/users/spf13/gists{/gist_id}","starred_url":"https://api.github.com/users/spf13/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/spf13/subscriptions","organizations_url":"https://api.github.com/users/spf13/orgs","repos_url":"https://api.github.com/users/spf13/repos","events_url":"https://api.github.com/users/spf13/events{/privacy}","received_events_url":"https://api.github.com/users/spf13/received_events","type":"User","site_admin":false},"created_at":"2016-01-01T20:03:40Z","updated_at":"2016-01-01T20:03:40Z","body":"what happens when you set:\r\n`git config merge.conflictstyle diff3`"}}