summaryrefslogtreecommitdiff
path: root/xdiff/xprepare.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-16 14:23:43 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-16 14:23:43 -0700
commit4bfe7cb6668c43c1136304bbb17eea1b3ddf0237 (patch)
tree342d8c9114e29f390c3400727915377d5bc6bc8b /xdiff/xprepare.c
parent50b68aeb392537a730a86349293acf046a778b74 (diff)
downloadgit-4bfe7cb6668c43c1136304bbb17eea1b3ddf0237.tar.gz
Sync with "maint"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xprepare.c')
0 files changed, 0 insertions, 0 deletions