Merge branch 'jc/conflict-marker-size'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:51 +0000 (20:28 -0800)
commit06dbc1ea5768618337bf11e5f64c4f9f14a68008
tree049d23a7b372994b77c192df0537b232daa10d07
parentdf91d0e4d30ddc9bf2c55e3a63be9cb5318a409a
parent8588567c96490b8d236b1bc13f9bcb0dfa118efe
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
archive.c
builtin-merge-file.c
builtin-pack-objects.c
convert.c
ll-merge.c
ll-merge.h
rerere.c
xdiff/xdiff.h
xdiff/xmerge.c