diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-13 11:04:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-13 11:04:58 -0800 |
| commit | 41e2edf41a6d501f1b8beca7f1f0bcbe9296dcc2 (patch) | |
| tree | 5a3e97b7c147242f3550a7318ec45480ecaa7480 /git-gui/lib/merge.tcl | |
| parent | 6bc4c72132adbdc06c428f86a96f27e4f8173b99 (diff) | |
| parent | 95b002eeb38de89feb7f0cc1a55721b45fd3cf11 (diff) | |
| download | git-41e2edf41a6d501f1b8beca7f1f0bcbe9296dcc2.tar.gz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Automatically spell check commit messages as the user types
git-gui: support Git Gui.app under OS X 10.5
git-gui: Update German translation.
git-gui: (i18n) Fix a bunch of still untranslated strings.
Diffstat (limited to 'git-gui/lib/merge.tcl')
| -rw-r--r-- | git-gui/lib/merge.tcl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 63e14279c1..cc26b07808 100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/lib/merge.tcl @@ -116,8 +116,7 @@ method _start {} { lappend cmd HEAD lappend cmd $name - set msg [mc "Merging %s and %s" $current_branch $stitle] - ui_status "$msg..." + ui_status [mc "Merging %s and %s..." $current_branch $stitle] set cons [console::new [mc "Merge"] "merge $stitle"] console::exec $cons $cmd [cb _finish $cons] @@ -236,7 +235,7 @@ Continue with resetting the current changes?"] set fd [git_read --stderr read-tree --reset -u -v HEAD] fconfigure $fd -blocking 0 -translation binary fileevent $fd readable [namespace code [list _reset_wait $fd]] - $::main_status start [mc "Aborting"] {files reset} + $::main_status start [mc "Aborting"] [mc "files reset"] } else { unlock_index } |