summaryrefslogtreecommitdiff
path: root/xdiff/xmacros.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-28 11:49:37 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-28 11:49:37 -0800
commit0d5708594310c2603682f16cfcb742c3f11704f4 (patch)
treeb8062b3931c06598f2cbc6467660458052fed636 /xdiff/xmacros.h
parentMerge branch 'jc/checkout-m-twoway' into maint (diff)
parentuse custom rename score during --follow (diff)
downloadtgif-0d5708594310c2603682f16cfcb742c3f11704f4.tar.xz
Merge branch 'jk/follow-rename-score' into maint
* jk/follow-rename-score: use custom rename score during --follow
Diffstat (limited to 'xdiff/xmacros.h')
0 files changed, 0 insertions, 0 deletions