{"thread":{"id":"31063","subject":"Unifying mergetool configuration between git and git-gui","startedAt":"2012-07-22T14:22:23Z","lastAt":"2012-07-23T02:00:29Z","messageCount":2,"participants":["Sebastian Schuberth","David Aguilar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"195442","messageId":"500C0C9F.1000709@gmail.com","threadId":"31063","inReplyTo":null,"subject":"Unifying mergetool configuration between git and git-gui","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2012-07-22T14:22:23Z","receivedAt":"2012-07-22T14:22:23Z","isPatch":false,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Hi,\n\nI was about to add a configuration for yet another mergetool when I \nrealized that git gui's mergetool.tcl pretty much duplicates git's \nmergetools/* configuration files. Can some one tell me why this is \nnecessary? I would have expected git gui to simply rely on \"git \nmergetool\" to launch the mergetool. Or, in case that git gui needs to \nuse a different tool than the one configured as mergetool, that \nmergetool.tcl somehow uses the configuration from mergetools/*.\n\nThanks for any insights.\n\n-- \nSebastian Schuberth\n"},{"id":"195471","messageId":"CAJDDKr4aeDToxw177pBoZE5SW5hRoM3_xWi9oHLz0gmRkpVFTw@mail.gmail.com","threadId":"31063","inReplyTo":"500C0C9F.1000709@gmail.com","subject":"Re: Unifying mergetool configuration between git and git-gui","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2012-07-23T02:00:29Z","receivedAt":"2012-07-23T02:00:29Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Sun, Jul 22, 2012 at 7:22 AM, Sebastian Schuberth\n<sschuberth@gmail.com> wrote:\n> Hi,\n>\n> I was about to add a configuration for yet another mergetool when I realized\n> that git gui's mergetool.tcl pretty much duplicates git's mergetools/*\n> configuration files. Can some one tell me why this is necessary? I would\n> have expected git gui to simply rely on \"git mergetool\" to launch the\n> mergetool. Or, in case that git gui needs to use a different tool than the\n> one configured as mergetool, that mergetool.tcl somehow uses the\n> configuration from mergetools/*.\n>\n> Thanks for any insights.\n\nI think the mergetool stuff in git-gui predates git-mergetool.\n\nDitto the \"external diff\" stuff in gitk -- it predates git-difftool.\n\nIt would be good to unify these so that the difftool/mergetool\nexperience is consistent.\n\nAs for how to have different diff/merge tools in GUI vs non-GUI modes\n-- we have 'diff.guitool' to override 'diff.tool' when \"git difftool\n--gui\" is used.  We do not have an equivalent 'merge.guitool', but\nthat would probably be the way to do it.\n-- \nDavid\n"}]}