Re: [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool

2013-01-25 Thread Alexey Shumkin
Maybe, some time ;) Actually, I'm not TCL-programmer. With one of these patches I just have solved one my problem (to run tortoisemerge with git-gui) when I was showing to my collegue how to work with Git, and on the side I fixed another two bugs. So, I decided to sumbit these patches, to avoid app

Re: [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool

2013-01-24 Thread David Aguilar
On Wed, Jan 23, 2013 at 11:16 PM, Alexey Shumkin wrote: > Options are taken from /mergetools/vim > > Signed-off-by: Alexey Shumkin > --- > git-gui/lib/mergetool.tcl | 8 +++- > 1 file changed, 7 insertions(+), 1 deletion(-) A better long-term solution might be to teach git gui to use "git d

[PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool

2013-01-23 Thread Alexey Shumkin
Options are taken from /mergetools/vim Signed-off-by: Alexey Shumkin --- git-gui/lib/mergetool.tcl | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 3c8e73b..4fc1cab 100644 --- a/git-gui/lib/mergetool.tcl +++ b/