summaryrefslogtreecommitdiff
path: root/git-gui/po/glossary/git-gui-glossary.pot
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 11:16:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 11:16:57 -0700
commit5977744d045cacb809a3e3630dbbd28fe83976ae (patch)
tree276ab50231e80bf913148e421247a5a4ecf78653 /git-gui/po/glossary/git-gui-glossary.pot
parentMerge branch 'by/diff-graph' (diff)
parentdiff: fix "git show -C -C" output when renaming a binary file (diff)
downloadtgif-5977744d045cacb809a3e3630dbbd28fe83976ae.tar.xz
Merge branch 'cc/maint-diff-CC-binary'
* cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c
Diffstat (limited to 'git-gui/po/glossary/git-gui-glossary.pot')
0 files changed, 0 insertions, 0 deletions