diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-09 21:00:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-09 21:00:43 (GMT) |
| commit | 46be023084bd6ce4958f16427da7cdaf91cff205 (patch) | |
| tree | 2986f28c116c2a6eaf96f551968e1a878abfde97 /Documentation/config/feature.txt | |
| parent | 20d451c4dab4e41efb315a4c7f9d1eb2d83c4fc5 (diff) | |
| parent | 5f46e610cb43496612d7ec030d142b6b8515399d (diff) | |
| download | git-46be023084bd6ce4958f16427da7cdaf91cff205.zip git-46be023084bd6ce4958f16427da7cdaf91cff205.tar.gz git-46be023084bd6ce4958f16427da7cdaf91cff205.tar.bz2 | |
Merge branch 'ct/diff-with-merge-base-clarification' into master
Recent update to "git diff" meant as a code clean-up introduced a
bug in its error handling code, which has been corrected.
* ct/diff-with-merge-base-clarification:
diff: check for merge bases before assigning sym->base
Diffstat (limited to 'Documentation/config/feature.txt')
0 files changed, 0 insertions, 0 deletions