git/Documentation
Junio C Hamano 8775279891 Merge branch 'jn/mergetool-hideresolved-is-optional'
Disable the recent mergetool's hideresolved feature by default for
backward compatibility and safety.

* jn/mergetool-hideresolved-is-optional:
  doc: describe mergetool configuration in git-mergetool(1)
  mergetool: do not enable hideResolved by default
2021-03-14 16:01:41 -07:00
..
2020-07-06 22:09:16 -07:00
2021-03-08 16:09:43 -08:00
2019-05-09 00:37:27 +09:00
2020-08-04 18:34:02 -07:00
2020-09-19 15:56:06 -07:00
2021-02-05 16:40:44 -08:00
2021-01-04 11:27:48 -08:00
2020-04-29 16:15:27 -07:00
2019-01-23 11:37:29 -08:00
2021-02-18 10:53:33 -08:00
2020-10-22 10:29:30 -07:00
2021-01-04 11:27:48 -08:00
2019-05-07 13:04:48 +09:00
2019-05-07 13:04:48 +09:00
2019-10-21 12:02:39 +09:00