summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-28 12:10:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-28 12:10:03 -0700
commitc85f0a2a0e399cf88f318113225700693a6039a2 (patch)
tree37ba047035f2eb5936bb8729572797c8611770c3 /xdiff-interface.c
parentMerge branch 'jk/check-corrupt-objects-carefully' (diff)
parentpretty: Fix bug in truncation support for %>, %< and %>< (diff)
downloadtgif-c85f0a2a0e399cf88f318113225700693a6039a2.tar.xz
Merge branch 'nd/pretty-formats'
* nd/pretty-formats: pretty: Fix bug in truncation support for %>, %< and %><
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions