Junio C Hamano 456cb4cf3e Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint ...

* cb/maint-1.6.0-xdl-merge-fix:
  Change xdl_merge to generate output even for null merges
  t6023: merge-file fails to output anything for a degenerate merge

Conflicts:
	xdiff/xmerge.c

2009-06-02 07:48:44 -07:00

..

xdiff.h

Merge branch 'js/patience-diff'

2009-01-23 21:51:38 -08:00

xdiffi.c

Fix typos / spelling in comments

2009-04-22 19:02:12 -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

2009-03-15 18:25:24 -07:00

xemit.h

Allow alternate "low-level" emit function from xdl_diff

2008-10-25 12:09:31 -07:00

xinclude.h

War on whitespace

2007-06-07 00:04:01 -07:00

xmacros.h

War on whitespace

2007-06-07 00:04:01 -07:00

xmerge.c

Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

2009-06-02 07:48:44 -07:00

xpatience.c

Implement the patience diff algorithm

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

xprepare.c

Implement the patience diff algorithm

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

xprepare.h

War on whitespace

2007-06-07 00:04:01 -07:00

xtypes.h

War on whitespace

2007-06-07 00:04:01 -07:00

xutils.c

Fix combined use of whitespace ignore options to diff

2009-01-19 21:21:58 -08:00

xutils.h

War on whitespace

2007-06-07 00:04:01 -07:00