diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 07:45:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 07:45:35 (GMT) |
| commit | fab4a8a39666793d407371f519e8b6d25d33fa84 (patch) | |
| tree | ea8851107dda1a726b3eec91d347996ead1ab683 /notes-merge.h | |
| parent | 8c59ba9a764f1ae1f8d176ea17c636183cfd7267 (diff) | |
| parent | f3a3a021c716b46ed35e6b7171bbff4d8042da68 (diff) | |
| download | git-fab4a8a39666793d407371f519e8b6d25d33fa84.zip git-fab4a8a39666793d407371f519e8b6d25d33fa84.tar.gz git-fab4a8a39666793d407371f519e8b6d25d33fa84.tar.bz2 | |
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)
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions