summaryrefslogtreecommitdiff
path: root/xdiff/xpatience.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:17 -0700
commit79814585b78329b5009b7684290bc0c8872220db (patch)
treec4ef8ae29075d2e76ec1461ab6c4eae637445af4 /xdiff/xpatience.c
parentMerge branch 'bc/unstash-clean-crufts' (diff)
parentam: preliminary support for hg patches (diff)
downloadtgif-79814585b78329b5009b7684290bc0c8872220db.tar.xz
Merge branch 'gb/am-hg-patch'
* gb/am-hg-patch: am: preliminary support for hg patches
Diffstat (limited to 'xdiff/xpatience.c')
0 files changed, 0 insertions, 0 deletions