Skip to content
Commits on Jan 21, 2010
  1. @gitster

    Merge branch 'jc/conflict-marker-size'

    gitster committed Jan 20, 2010
    * 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
Commits on Jan 17, 2010
  1. @gitster

    rerere: honor conflict-marker-size attribute

    gitster committed Jan 16, 2010
    Signed-off-by: Junio C Hamano <>
Commits on Feb 18, 2008
  1. @gitster

    merge-recursive: split low-level merge functions out.

    gitster committed Dec 24, 2007
    This moves low-level merge functions out of merge-recursive.c and
    places them in a new separate file, ll-merge.c
    Signed-off-by: Junio C Hamano <>
Something went wrong with that request. Please try again.