subject:"\[PATCH 1\/3\] Add \-\-gui option to mergetool"

Re: [PATCH 1/3] Add --gui option to mergetool

2017-03-03 Thread Rémi Galan Alfonso

Hi, Denton Liu writes: > [...] > > +test_expect_success 'gui mergetool' ' > + test_when_finished "git reset --hard" && > + test_when_finished "git config merge.tool mytool" && > + test_when_finished "git config --unset merge.guitool" && > + git config merge.tool

Re: [PATCH 1/3] Add --gui option to mergetool

2017-03-03 Thread David Aguilar

On Fri, Mar 03, 2017 at 03:57:38AM -0800, Denton Liu wrote: > This fixes the discrepancy between difftool and mergetool where the > former has the --gui flag and the latter does not by adding the > functionality to mergetool. > > Signed-off-by: Denton Liu > --- >

[PATCH 1/3] Add --gui option to mergetool

2017-03-03 Thread Denton Liu

This fixes the discrepancy between difftool and mergetool where the former has the --gui flag and the latter does not by adding the functionality to mergetool. Signed-off-by: Denton Liu --- Documentation/git-mergetool.txt| 8 +++-