diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-06 10:39:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-06 10:39:07 -0800 |
| commit | 932f7e47699993de0f6ad2af92be613994e40afe (patch) | |
| tree | 1cc024398509d869352d4745acce18995da3a629 /git-gui/lib/mergetool.tcl | |
| parent | Merge branch 'maint' (diff) | |
| parent | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff) | |
| download | tgif-932f7e47699993de0f6ad2af92be613994e40afe.tar.xz | |
Merge branch 'maint'
* maint:
Documentation/gitmodules: Only 'update' and 'url' are required
l10n: de.po: fix translation of 'prefix'
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions