Files
git/Documentation
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
..
2020-08-04 18:34:02 -07:00
2021-10-25 09:12:56 -07:00
2021-09-28 10:31:02 -07:00
2021-09-28 10:31:02 -07:00
2019-05-07 13:04:48 +09:00
2021-10-29 15:43:13 -07:00
2019-10-21 12:02:39 +09:00