Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 21, 2010
  1. Junio C Hamano

    Merge branch 'jc/conflict-marker-size'

    gitster authored
    * 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
Commits on Jan 17, 2010
  1. Junio C Hamano

    rerere: honor conflict-marker-size attribute

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 18, 2008
  1. Junio C Hamano

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

    gitster authored
    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 <gitster@pobox.com>
Something went wrong with that request. Please try again.