git/xdiff at 81b50f3ce40bfdd66e5d967bf82be001039a9a98 - git

mirror of https://github.com/git/git.git synced 2025-03-18 23:08:41 +00:00

History

Junio C Hamano 06dbc1ea57 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

2010-01-20 20:28:51 -08:00

xdiff.h

Merge branch 'jc/conflict-marker-size'

2010-01-20 20:28:51 -08:00

xdiffi.c

refactor: use bitsizeof() instead of 8 * sizeof()

2009-07-22 21:57:41 -07:00

xdiffi.h

Implement the patience diff algorithm

2009-01-07 13:35:44 -08:00

xemit.c

Fix various dead stores found by the clang static analyzer