Also added Russian translation of the added error message "%s cannot be used without a base"
Signed-off-by: Alexey Shumkin <[email protected]> --- git-gui/lib/mergetool.tcl | 10 ++++++++++ git-gui/po/ru.po | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 837ce17..d978770 100644 --- a/git-gui/lib/mergetool.tcl +++ b/git-gui/lib/mergetool.tcl @@ -257,6 +257,16 @@ proc merge_resolve_tool2 {} { set cmdline [list "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"] } } + tortoisemerge { + if {$base_stage ne {}} { + set cmdline [list "$merge_tool_path" \ + -base:$BASE -mine:$LOCAL \ + -theirs:$REMOTE -merged:$MERGED] + } else { + error_popup [mc "%s cannot be used without a base" "TortoiseMerge"] + return + } + } vimdiff { error_popup [mc "Not a GUI merge tool: '%s'" $tool] return diff --git a/git-gui/po/ru.po b/git-gui/po/ru.po index ca4343b..e9ef810 100644 --- a/git-gui/po/ru.po +++ b/git-gui/po/ru.po @@ -1948,6 +1948,10 @@ msgstr "Конфликтующий файл не существует" msgid "Not a GUI merge tool: '%s'" msgstr "'%s' не является программой слияния" +#: lib/mergetool.tcl:280 +msgid "%s cannot be used without a base" +msgstr "%s не может использоваться без базовой версии" + #: lib/mergetool.tcl:268 #, tcl-format msgid "Unsupported merge tool '%s'" -- 1.8.1.1.10.g9255f3f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
