[PATCH 2/3] mergetool--lib: Add diffuse as a tool

Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-gui/lib/mergetool.tcl | 9 + 1 file changed, 9 insertions(+) diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 4fc1cab..837ce17 100644 --- a/git-gui/lib/mergetool.tcl +++ b/git-gui/lib/mergetool.tcl

[PATCH 3/3] mergetool--lib: Add TortoiseMerge as a tool

Also added Russian translation of the added error message %s cannot be used without a base Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-gui/lib/mergetool.tcl | 10 ++ git-gui/po/ru.po | 4 2 files changed, 14 insertions(+) diff --git a/git-gui/lib

<    1   2