diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-06 16:03:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-06 16:03:22 -0700 |
| commit | 1b118da8bd1878d78589afd9f755b9d52a9579ad (patch) | |
| tree | 3bef12e4e07a0be6331a305522ae278a2b8cabe5 /builtin-merge-file.c | |
| parent | Mention the fact that 'git annotate' is only for backward compatibility. (diff) | |
| parent | git-gui: Fix diff parsing for lines starting with "--" or "++" (diff) | |
| download | tgif-1b118da8bd1878d78589afd9f755b9d52a9579ad.tar.xz | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Fix diff parsing for lines starting with "--" or "++"
git-gui: Fix string escaping in po2msg.sh
git gui: show diffs with a minimum of 1 context line
git-gui: update all remaining translations to French.
git-gui: Update french translation
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions