summaryrefslogtreecommitdiff
path: root/builtin-fast-export.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 20:28:51 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 20:28:51 -0800
commit06dbc1ea5768618337bf11e5f64c4f9f14a68008 (patch)
tree049d23a7b372994b77c192df0537b232daa10d07 /builtin-fast-export.c
parentMerge branch 'ag/maint-apply-too-large-p' (diff)
parentrerere: honor conflict-marker-size attribute (diff)
downloadtgif-06dbc1ea5768618337bf11e5f64c4f9f14a68008.tar.xz
Merge branch 'jc/conflict-marker-size'
* jc/conflict-marker-size: rerere: honor conflict-marker-size attribute rerere: prepare for customizable conflict marker length conflict-marker-size: new attribute rerere: use ll_merge() instead of using xdl_merge() merge-tree: use ll_merge() not xdl_merge() xdl_merge(): allow passing down marker_size in xmparam_t xdl_merge(): introduce xmparam_t for merge specific parameters git_attr(): fix function signature Conflicts: builtin-merge-file.c ll-merge.c xdiff/xdiff.h xdiff/xmerge.c
Diffstat (limited to 'builtin-fast-export.c')
0 files changed, 0 insertions, 0 deletions