diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-03 00:53:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-03 00:53:57 +0900 |
| commit | ff8e25e99e46b0425990d48c2f1d964a68fc3908 (patch) | |
| tree | 62d6454400d597237497adef73d307cdde7a0ebf /gpg-interface.c | |
| parent | d582ea202b626dcc6c3b01e1e11a296d9badd730 (diff) | |
| parent | 4f445453136b8c3575bc4d4c45fc9b7930688a5c (diff) | |
Merge branch 'en/merge-cleanup-more'
Further clean-up of merge-recursive machinery.
* en/merge-cleanup-more:
merge-recursive: avoid showing conflicts with merge branch before HEAD
merge-recursive: improve auto-merging messages with path collisions
Diffstat (limited to 'gpg-interface.c')
0 files changed, 0 insertions, 0 deletions