diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:51 -0700 |
commit | 46d58a084b86a7fc5149939d3ade77a0abedc0d2 (patch) | |
tree | 786b7bffcef1ad5bad316aee5af640a3b0280020 /builtin/merge-recursive.c | |
parent | Merge branch 'jk/diff-submodule-diff-inline' (diff) | |
parent | Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui (diff) | |
download | tgif-46d58a084b86a7fc5149939d3ade77a0abedc0d2.tar.xz |
Merge branch 'pt/gitgui-updates'
A new version of git-gui, now at its 0.21.0 tag.
* pt/gitgui-updates: (22 commits)
git-gui: set version 0.21
git-gui: Mark 'All' in remote.tcl for translation
git-gui i18n: Updated Bulgarian translation (565,0f,0u)
git-gui: avoid persisting modified author identity
git-gui: handle the encoding of Git's output correctly
git-gui: unicode file name support on windows
git-gui: Update Russian translation
git-gui: maintain backwards compatibility for merge syntax
git-gui i18n: mark string in lib/error.tcl for translation
git-gui: fix incorrect use of Tcl append command
git-gui i18n: mark "usage:" strings for translation
git-gui i18n: internationalize use of colon punctuation
git-gui: ensure the file in the diff pane is in the list of selected files
git-gui: support for $FILENAMES in tool definitions
git-gui: fix initial git gui message encoding
git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`
git-gui: fix detection of Cygwin
Amend tab ordering and text widget border and highlighting.
Allow keyboard control to work in the staging widgets.
...
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions