summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-08 23:22:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-08 23:22:05 -0700
commitf7af75777fd5a217d43acb2098cf043a73c20b01 (patch)
treef19af42d6785fa427437250f8125c7fe9f6fceef /xdiff/xmerge.c
parentMerge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1 (diff)
parentprocess_{tree,blob}: Remove useless xstrdup calls (diff)
downloadtgif-f7af75777fd5a217d43acb2098cf043a73c20b01.tar.xz
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: process_{tree,blob}: Remove useless xstrdup calls
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions