diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-13 12:21:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-13 12:21:11 -0700 |
| commit | 2c75b3255b1d1f525c7c61b540b99af1ad84e8f8 (patch) | |
| tree | 34494132932eb5d43799c67a4cd9e087b72df58a /diff.c | |
| parent | Merge branch 'ds/github-actions-use-newer-ubuntu' into maint (diff) | |
| parent | merge: only apply autostash when appropriate (diff) | |
| download | git-2c75b3255b1d1f525c7c61b540b99af1ad84e8f8.tar.gz git-2c75b3255b1d1f525c7c61b540b99af1ad84e8f8.zip | |
Merge branch 'en/merge-unstash-only-on-clean-merge' into maint
The auto-stashed local changes created by "git merge --autostash"
was mixed into a conflicted state left in the working tree, which
has been corrected.
* en/merge-unstash-only-on-clean-merge:
merge: only apply autostash when appropriate
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions