diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-01-23 21:37:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-23 21:37:12 -0800 |
| commit | cab31fa076253fcfafa7572c24e40f12a1e09ae3 (patch) | |
| tree | 00d6cf078f517f759499c5e44799682377ace1b9 /xdiff/xmerge.c | |
| parent | git-commit: exit non-zero if we fail to commit the index (diff) | |
| parent | git-gui: Correctly cleanup msgfmt '1 message untranslated' output (diff) | |
| download | tgif-cab31fa076253fcfafa7572c24e40f12a1e09ae3.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Correctly cleanup msgfmt '1 message untranslated' output
git-gui: Make the statistics of po2msg match those of msgfmt
git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available
git-gui: Work around random missing scrollbar in revision list
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions