Files
git/builtin
Junio C Hamano 4ce498baa3 Merge branch 'en/zdiff3'
"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-15 09:39:47 -08:00
..
2021-10-13 15:15:57 -07:00
2020-07-30 19:18:06 -07:00
2021-12-15 09:39:47 -08:00
2021-10-28 09:57:09 -07:00
2021-02-25 16:43:30 -08:00
2021-02-25 16:43:30 -08:00
2021-07-28 13:17:59 -07:00
2020-03-24 15:04:43 -07:00
2021-11-12 15:29:25 -08:00
2021-11-10 15:01:20 -08:00
2021-10-23 10:45:25 -07:00
2021-10-13 15:15:58 -07:00
2021-04-14 13:47:21 -07:00
2021-09-28 10:31:02 -07:00
2020-03-24 15:04:44 -07:00
2021-10-25 16:06:58 -07:00
2021-12-10 14:35:10 -08:00
2021-12-10 14:35:12 -08:00
2020-07-30 19:18:06 -07:00
2021-11-03 13:25:36 -07:00
2020-08-11 18:04:11 -07:00