summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 22:18:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 22:18:00 -0800
commit9e6324c4d784c36d2558ccdea7c8470ac2701437 (patch)
tree8a1c2992e12af92298a5f861ea304547ac3158bc /mergetools/opendiff
parentMerge branch 'master' of git://repo.or.cz/git-gui (diff)
parentUpdate draft release notes for 1.7.8.1 (diff)
downloadtgif-9e6324c4d784c36d2558ccdea7c8470ac2701437.tar.xz
Merge branch 'maint'
* maint: Update draft release notes for 1.7.8.1 Git 1.7.7.5 Git 1.7.6.5 blame: don't overflow time buffer fetch: create status table using strbuf Conflicts: RelNotes
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions