{"action":"closed","number":13,"pull_request":{"url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls/13","id":87711591,"html_url":"https://github.com/ThierryGoubier/GitFileTree-MergeDriver/pull/13","diff_url":"https://github.com/ThierryGoubier/GitFileTree-MergeDriver/pull/13.diff","patch_url":"https://github.com/ThierryGoubier/GitFileTree-MergeDriver/pull/13.patch","issue_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/issues/13","number":13,"state":"closed","locked":false,"title":"Allow merge to be used with git mergetool","user":{"login":"zecke","id":390178,"avatar_url":"https://avatars.githubusercontent.com/u/390178?v=3","gravatar_id":"","url":"https://api.github.com/users/zecke","html_url":"https://github.com/zecke","followers_url":"https://api.github.com/users/zecke/followers","following_url":"https://api.github.com/users/zecke/following{/other_user}","gists_url":"https://api.github.com/users/zecke/gists{/gist_id}","starred_url":"https://api.github.com/users/zecke/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zecke/subscriptions","organizations_url":"https://api.github.com/users/zecke/orgs","repos_url":"https://api.github.com/users/zecke/repos","events_url":"https://api.github.com/users/zecke/events{/privacy}","received_events_url":"https://api.github.com/users/zecke/received_events","type":"User","site_admin":false},"body":"E.g. when using git rebase the normal git-merge tool does not seem to be\r\nused. Re-use the existing mergers and deal with the different formats. I am\r\nnot fully sure it works all right but on first merge it seemed to have done the\r\nright thing (even if version didn't change).\r\n\r\n~/.gitconfig:\r\n[mergetool \"mcmerge\"]\r\n        cmd = /GitFileTree-MergeDriver/merge --mergetool $BASE $LOCAL $REMOTE $MERGED\r\n\r\ngit mergetool --tool=mcmerge","created_at":"2016-10-03T12:57:18Z","updated_at":"2016-10-03T19:46:10Z","closed_at":"2016-10-03T19:46:10Z","merged_at":"2016-10-03T19:46:10Z","merge_commit_sha":"a72c7da8ffbef39d463fc47c3edcccb134152e14","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls/13/commits","review_comments_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls/13/comments","review_comment_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/issues/13/comments","statuses_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/statuses/41de221fdeb0d7292b39ddc2c1f8a1a62e386392","head":{"label":"zecke:add-mergetool","ref":"add-mergetool","sha":"41de221fdeb0d7292b39ddc2c1f8a1a62e386392","user":{"login":"zecke","id":390178,"avatar_url":"https://avatars.githubusercontent.com/u/390178?v=3","gravatar_id":"","url":"https://api.github.com/users/zecke","html_url":"https://github.com/zecke","followers_url":"https://api.github.com/users/zecke/followers","following_url":"https://api.github.com/users/zecke/following{/other_user}","gists_url":"https://api.github.com/users/zecke/gists{/gist_id}","starred_url":"https://api.github.com/users/zecke/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zecke/subscriptions","organizations_url":"https://api.github.com/users/zecke/orgs","repos_url":"https://api.github.com/users/zecke/repos","events_url":"https://api.github.com/users/zecke/events{/privacy}","received_events_url":"https://api.github.com/users/zecke/received_events","type":"User","site_admin":false},"repo":{"id":69870511,"name":"GitFileTree-MergeDriver","full_name":"zecke/GitFileTree-MergeDriver","owner":{"login":"zecke","id":390178,"avatar_url":"https://avatars.githubusercontent.com/u/390178?v=3","gravatar_id":"","url":"https://api.github.com/users/zecke","html_url":"https://github.com/zecke","followers_url":"https://api.github.com/users/zecke/followers","following_url":"https://api.github.com/users/zecke/following{/other_user}","gists_url":"https://api.github.com/users/zecke/gists{/gist_id}","starred_url":"https://api.github.com/users/zecke/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zecke/subscriptions","organizations_url":"https://api.github.com/users/zecke/orgs","repos_url":"https://api.github.com/users/zecke/repos","events_url":"https://api.github.com/users/zecke/events{/privacy}","received_events_url":"https://api.github.com/users/zecke/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/zecke/GitFileTree-MergeDriver","description":null,"fork":true,"url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver","forks_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/forks","keys_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/teams","hooks_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/hooks","issue_events_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/issues/events{/number}","events_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/events","assignees_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/assignees{/user}","branches_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/branches{/branch}","tags_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/tags","blobs_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/git/refs{/sha}","trees_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/statuses/{sha}","languages_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/languages","stargazers_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/stargazers","contributors_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/contributors","subscribers_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/subscribers","subscription_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/subscription","commits_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/commits{/sha}","git_commits_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/git/commits{/sha}","comments_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/comments{/number}","issue_comment_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/issues/comments{/number}","contents_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/contents/{+path}","compare_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/merges","archive_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/downloads","issues_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/issues{/number}","pulls_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/pulls{/number}","milestones_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/milestones{/number}","notifications_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/labels{/name}","releases_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/releases{/id}","deployments_url":"https://api.github.com/repos/zecke/GitFileTree-MergeDriver/deployments","created_at":"2016-10-03T12:56:11Z","updated_at":"2016-10-03T12:56:12Z","pushed_at":"2016-10-03T12:57:08Z","git_url":"git://github.com/zecke/GitFileTree-MergeDriver.git","ssh_url":"git@github.com:zecke/GitFileTree-MergeDriver.git","clone_url":"https://github.com/zecke/GitFileTree-MergeDriver.git","svn_url":"https://github.com/zecke/GitFileTree-MergeDriver","homepage":null,"size":65721,"stargazers_count":0,"watchers_count":0,"language":"Smalltalk","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"ThierryGoubier:master","ref":"master","sha":"9947d4aa0767fb65feb467224d38115901c97bff","user":{"login":"ThierryGoubier","id":4500310,"avatar_url":"https://avatars.githubusercontent.com/u/4500310?v=3","gravatar_id":"","url":"https://api.github.com/users/ThierryGoubier","html_url":"https://github.com/ThierryGoubier","followers_url":"https://api.github.com/users/ThierryGoubier/followers","following_url":"https://api.github.com/users/ThierryGoubier/following{/other_user}","gists_url":"https://api.github.com/users/ThierryGoubier/gists{/gist_id}","starred_url":"https://api.github.com/users/ThierryGoubier/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ThierryGoubier/subscriptions","organizations_url":"https://api.github.com/users/ThierryGoubier/orgs","repos_url":"https://api.github.com/users/ThierryGoubier/repos","events_url":"https://api.github.com/users/ThierryGoubier/events{/privacy}","received_events_url":"https://api.github.com/users/ThierryGoubier/received_events","type":"User","site_admin":false},"repo":{"id":19243535,"name":"GitFileTree-MergeDriver","full_name":"ThierryGoubier/GitFileTree-MergeDriver","owner":{"login":"ThierryGoubier","id":4500310,"avatar_url":"https://avatars.githubusercontent.com/u/4500310?v=3","gravatar_id":"","url":"https://api.github.com/users/ThierryGoubier","html_url":"https://github.com/ThierryGoubier","followers_url":"https://api.github.com/users/ThierryGoubier/followers","following_url":"https://api.github.com/users/ThierryGoubier/following{/other_user}","gists_url":"https://api.github.com/users/ThierryGoubier/gists{/gist_id}","starred_url":"https://api.github.com/users/ThierryGoubier/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ThierryGoubier/subscriptions","organizations_url":"https://api.github.com/users/ThierryGoubier/orgs","repos_url":"https://api.github.com/users/ThierryGoubier/repos","events_url":"https://api.github.com/users/ThierryGoubier/events{/privacy}","received_events_url":"https://api.github.com/users/ThierryGoubier/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/ThierryGoubier/GitFileTree-MergeDriver","description":"","fork":false,"url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver","forks_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/forks","keys_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/teams","hooks_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/hooks","issue_events_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/issues/events{/number}","events_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/events","assignees_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/assignees{/user}","branches_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/branches{/branch}","tags_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/tags","blobs_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/git/refs{/sha}","trees_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/statuses/{sha}","languages_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/languages","stargazers_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/stargazers","contributors_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/contributors","subscribers_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/subscribers","subscription_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/subscription","commits_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/commits{/sha}","git_commits_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/git/commits{/sha}","comments_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/comments{/number}","issue_comment_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/issues/comments{/number}","contents_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/contents/{+path}","compare_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/merges","archive_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/downloads","issues_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/issues{/number}","pulls_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls{/number}","milestones_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/milestones{/number}","notifications_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/labels{/name}","releases_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/releases{/id}","deployments_url":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/deployments","created_at":"2014-04-28T15:25:49Z","updated_at":"2016-08-15T09:56:02Z","pushed_at":"2016-10-03T19:46:11Z","git_url":"git://github.com/ThierryGoubier/GitFileTree-MergeDriver.git","ssh_url":"git@github.com:ThierryGoubier/GitFileTree-MergeDriver.git","clone_url":"https://github.com/ThierryGoubier/GitFileTree-MergeDriver.git","svn_url":"https://github.com/ThierryGoubier/GitFileTree-MergeDriver","homepage":null,"size":65978,"stargazers_count":13,"watchers_count":13,"language":"Smalltalk","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":6,"mirror_url":null,"open_issues_count":2,"forks":6,"open_issues":2,"watchers":13,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls/13"},"html":{"href":"https://github.com/ThierryGoubier/GitFileTree-MergeDriver/pull/13"},"issue":{"href":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/issues/13"},"comments":{"href":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/issues/13/comments"},"review_comments":{"href":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls/13/comments"},"review_comment":{"href":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/pulls/13/commits"},"statuses":{"href":"https://api.github.com/repos/ThierryGoubier/GitFileTree-MergeDriver/statuses/41de221fdeb0d7292b39ddc2c1f8a1a62e386392"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"ThierryGoubier","id":4500310,"avatar_url":"https://avatars.githubusercontent.com/u/4500310?v=3","gravatar_id":"","url":"https://api.github.com/users/ThierryGoubier","html_url":"https://github.com/ThierryGoubier","followers_url":"https://api.github.com/users/ThierryGoubier/followers","following_url":"https://api.github.com/users/ThierryGoubier/following{/other_user}","gists_url":"https://api.github.com/users/ThierryGoubier/gists{/gist_id}","starred_url":"https://api.github.com/users/ThierryGoubier/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ThierryGoubier/subscriptions","organizations_url":"https://api.github.com/users/ThierryGoubier/orgs","repos_url":"https://api.github.com/users/ThierryGoubier/repos","events_url":"https://api.github.com/users/ThierryGoubier/events{/privacy}","received_events_url":"https://api.github.com/users/ThierryGoubier/received_events","type":"User","site_admin":false},"comments":3,"review_comments":0,"commits":1,"additions":119,"deletions":86,"changed_files":12}}
{"actor":{"display_login":"ThierryGoubier"}}