diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-09 14:57:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-09 14:57:00 -0800 |
| commit | 3d252a9c598b87f86d3370fcf285a31973d6ceb6 (patch) | |
| tree | d9d019693397a890e2c079bc0a5d50b1d27f947b /git-gui/lib/index.tcl | |
| parent | Merge git://ozlabs.org/~paulus/gitk (diff) | |
| parent | git-gui: correct spelling errors in comments (diff) | |
| download | tgif-3d252a9c598b87f86d3370fcf285a31973d6ceb6.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: correct spelling errors in comments
git-gui: add menu item to launch a bash shell on Windows.
git-gui: corrected setup of git worktree under cygwin.
git-gui: right half window is paned
git-gui: Add gui.displayuntracked option
git-gui: show the maxrecentrepo config option in the preferences dialog
git-gui: added gui.maxrecentrepo to extend the number of remembered repos
git-gui: Improve font rendering on retina macbooks
Diffstat (limited to 'git-gui/lib/index.tcl')
| -rw-r--r-- | git-gui/lib/index.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl index 8efbbdde21..74a81a7b42 100644 --- a/git-gui/lib/index.tcl +++ b/git-gui/lib/index.tcl @@ -414,7 +414,7 @@ proc revert_helper {txt paths} { # such distinction is needed in some languages. Previously, the # code used "Revert changes in" for both, but that can't work # in languages where 'in' must be combined with word from - # rest of string (in diffrent way for both cases of course). + # rest of string (in different way for both cases of course). # # FIXME: Unfortunately, even that isn't enough in some languages # as they have quite complex plural-form rules. Unfortunately, |