Junio C Hamano 123dfdff0d
Merge branch 'fr/vimdiff-layout' ...
Reimplement "vimdiff[123]" mergetool drivers with a more generic
layout mechanism.
* fr/vimdiff-layout:
mergetools: add description to all diff/merge tools
vimdiff: add tool documentation
vimdiff: integrate layout tests in the unit tests framework ('t' folder)
vimdiff: new implementation with layout support
2022-05-10 17:41:11 -07:00
2019-11-14 11:10:04 +09:00
2022-04-04 10:56:24 -07:00
2019-06-06 09:33:42 -07:00
2021-06-28 10:05:13 -07:00
2022-01-31 10:37:44 -08:00
2021-04-19 11:57:05 -07:00
2022-02-09 15:38:36 -08:00
2021-11-01 13:48:08 -07:00
2021-02-25 15:10:41 -08:00
2022-04-06 16:06:06 -07:00
2020-11-25 12:30:18 -08:00
2021-07-15 16:54:34 -07:00
2022-02-08 09:49:20 -08:00
2020-09-25 11:40:42 -07:00
2022-02-02 09:36:17 -08:00
2020-09-27 14:22:41 -07:00
2020-11-21 15:14:38 -08:00
2019-03-07 09:25:32 +09:00
2020-11-21 11:39:55 -08:00
2022-01-26 18:31:59 -08:00
2021-12-05 12:26:43 -08:00
2021-08-27 12:45:45 -07:00
2021-08-14 11:20:49 -07:00
2021-01-04 11:27:48 -08:00
2021-03-30 12:57:47 -07:00
2021-02-05 13:49:55 -08:00
2019-05-07 13:04:47 +09:00
2021-04-16 23:38:35 -07:00
2021-02-05 13:49:53 -08:00
2021-02-09 23:09:29 -08:00
2021-12-01 14:45:59 -08:00
2022-04-03 15:09:52 -07:00
2021-09-14 16:34:18 -07:00
2020-09-25 11:40:42 -07:00
2021-09-07 21:45:32 -07:00
2021-07-13 16:52:49 -07:00
2021-03-23 14:05:58 -07:00
2020-08-27 12:47:47 -07:00
2022-03-28 10:25:53 -07:00
2022-03-14 22:25:13 +00:00
2022-04-13 12:42:51 -07:00
2021-05-28 18:38:07 +09:00
2022-03-01 23:37:48 -08:00
2022-01-27 18:00:37 -08:00
2019-06-21 09:35:00 -07:00
2022-02-04 08:16:39 -08:00
2020-03-18 12:42:09 -07:00
2020-03-18 12:42:09 -07:00
2021-01-04 11:27:48 -08:00
2021-09-01 07:54:30 -07:00
2021-04-19 14:09:11 -07:00
2021-11-19 09:05:25 -08:00
123dfdff0d