Junio C Hamano 4aff18a3f0
Merge branch 'ls/mergetool-meld-auto-merge' ...
The 'meld' backend of the "git mergetool" learned to give the
underlying 'meld' the '--auto-merge' option, which would help
reduce the amount of text that requires manual merging.
* ls/mergetool-meld-auto-merge:
mergetool: allow auto-merge for meld to follow the vim-diff behavior
2020-09-22 12:36:29 -07:00
2019-11-14 11:10:04 +09:00
2020-02-06 11:08:00 -08:00
2019-06-06 09:33:42 -07:00
2019-05-16 11:36:23 +09:00
2020-02-10 10:52:10 -08:00
2019-04-02 13:57:00 +09:00
2019-08-11 17:40:07 -07:00
2020-08-24 13:55:06 -07:00
2020-05-06 11:39:40 -07:00
2020-05-24 16:23:59 -07:00
2020-07-30 09:16:49 -07:00
2020-07-08 16:37:43 -07:00
2020-08-18 13:25:05 -07:00
2020-07-30 12:43:10 -07:00
2020-04-07 22:37:18 -07:00
2019-03-07 09:25:32 +09:00
2019-08-13 13:33:55 -07:00
2020-01-15 14:06:06 -08:00
2020-03-25 13:57:42 -07:00
2019-08-13 13:33:55 -07:00
2020-06-24 09:14:21 -07:00
2019-05-07 13:04:47 +09:00
2020-04-16 11:05:48 -07:00
2020-04-10 09:28:02 -07:00
2020-09-16 17:11:20 -07:00
2020-03-20 14:22:31 -07:00
2020-05-21 09:31:42 -07:00
2020-02-10 10:52:10 -08:00
2020-04-06 13:42:43 -07:00
2020-02-16 15:40:42 -08:00
2019-06-25 14:05:38 -07:00
2019-03-18 14:09:54 +09:00
2020-07-23 18:00:34 -07:00
2020-03-05 12:50:28 -08:00
2019-06-21 09:35:00 -07:00
2020-04-06 13:42:43 -07:00
2020-03-18 12:42:09 -07:00
2020-03-18 12:42:09 -07:00
2020-03-23 13:14:53 -07:00
2019-08-05 10:05:24 -07:00
2020-08-03 18:03:46 -07:00
2020-01-22 12:27:08 -08:00
4aff18a3f0