diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-10 14:01:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-10 14:01:25 -0800 |
| commit | a466ef018ee9106f6e5b6247f32e7f1fb6a25577 (patch) | |
| tree | c864e5b32795dc60892515d60677b00704fe8bdd /compat/apple-common-crypto.h | |
| parent | Merge branch 'ma/bisect-leakfix' (diff) | |
| parent | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... (diff) | |
| download | tgif-a466ef018ee9106f6e5b6247f32e7f1fb6a25577.tar.xz | |
Merge branch 'ew/empty-merge-with-dirty-index'
"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.
* ew/empty-merge-with-dirty-index:
merge-recursive: do not look at the index during recursive merge
Diffstat (limited to 'compat/apple-common-crypto.h')
0 files changed, 0 insertions, 0 deletions