diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-14 17:09:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 17:09:13 (GMT) |
| commit | 74f6e0505bb854db5b25ba977432471fed218a73 (patch) | |
| tree | 9ca3fa7cc34de9f8fc86d828a65f830bc70106d0 /merge-file.c | |
| parent | e6b71b32892bf1600e7edaab17426f634e7e5e5a (diff) | |
| parent | 6758ad94405258294918ca5520acf1a3184a78b9 (diff) | |
| download | git-74f6e0505bb854db5b25ba977432471fed218a73.zip git-74f6e0505bb854db5b25ba977432471fed218a73.tar.gz git-74f6e0505bb854db5b25ba977432471fed218a73.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Add Brazilian Portuguese (pt-BR) translation
gitk: Make text selectable on Mac
gitk: Prevent the text pane from becoming editable
gitk: Add the equivalent of diff --color-words
gitk: Update Swedish translation (290t)
gitk: Show notes by default (like git log does)
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions