Re: [PATCH] Add --gui option to mergetool

2017-02-05 Thread David Aguilar
On Fri, Feb 03, 2017 at 10:43:03PM -0800, Denton Liu wrote: > * fix the discrepancy between difftool and mergetool where > the former has the --gui flag and the latter does not by adding the > functionality to mergetool Please avoid bullet points in commit messages when a simple paragraph

[PATCH] Add --gui option to mergetool

2017-02-03 Thread Denton Liu
* fix the discrepancy between difftool and mergetool where the former has the --gui flag and the latter does not by adding the functionality to mergetool * make difftool read 'merge.guitool' as a fallback, in accordance to the manpage for difftool: "git difftool falls back to git mergetool