Junio C Hamano fab4a8a396 Merge branch 'js/difftool-no-index' ...

The "--dir-diff" mode of "git difftool" is not useful in "--no-index"
mode; they are now explicitly marked as mutually incompatible.

* js/difftool-no-index:
  difftool --no-index: error out on --dir-diff (and don't crash)

2019-05-19 16:45:35 +09:00

21 KiB

Raw Blame History

View Raw