Junio C Hamano baa3b24593 Merge branch 'en/zdiff3' into next ...

"Zealous diff3" style of merge conflict presentation has been added.

* en/zdiff3:
  update documentation for new zdiff3 conflictStyle
  xdiff: implement a zealous diff3, or "zdiff3"

2021-12-07 22:53:23 -08:00

..

xdiff.h

xdiff: implement a zealous diff3, or "zdiff3"

2021-12-01 14:45:58 -08:00

xdiffi.c

xdiff: drop unused flags parameter from recs_match

2021-12-04 23:27:53 -08:00

xdiffi.h

Replace Free Software Foundation address in license notices

2017-11-09 13:21:21 +09:00

xemit.c

xdiff-interface: replace discard_hunk_line() with a flag

2021-05-11 12:47:31 +09:00

xemit.h

Replace Free Software Foundation address in license notices

2017-11-09 13:21:21 +09:00

xhistogram.c

xdiff: drop xpparam_t parameter from histogram cmp_recs()

2021-12-04 23:27:53 -08:00

xinclude.h

xdiff: use git-compat-util

2019-04-12 13:34:17 +09:00

xmacros.h

Replace Free Software Foundation address in license notices

2017-11-09 13:21:21 +09:00

xmerge.c

xdiff: implement a zealous diff3, or "zdiff3"

2021-12-01 14:45:58 -08:00

xpatience.c

Merge branch 'pw/patience-diff-clean-up'

2021-05-14 08:26:08 +09:00

xprepare.c

xdiff: avoid unnecessary memory allocations

2021-11-18 22:23:45 -08:00

xprepare.h

Replace Free Software Foundation address in license notices

2017-11-09 13:21:21 +09:00

xtypes.h

Replace Free Software Foundation address in license notices

2017-11-09 13:21:21 +09:00

xutils.c

xdiff: drop system includes in xutils.c

2019-07-28 21:51:19 -07:00

xutils.h

Replace Free Software Foundation address in license notices

2017-11-09 13:21:21 +09:00