While working on other things, I noticed a few miscellaneous issues in builtin/merge.c. Here's a few small fixes to address them. Elijah Newren (2): merge: only apply autostash when appropriate merge: avoid searching for strategies with fewer than 0 conflicts builtin/merge.c | 19 ++++++++++++++----- t/t7600-merge.sh | 9 +++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) base-commit: 9bf691b78cf906751e65d65ba0c6ffdcd9a5a12c Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1331%2Fnewren%2Fmisc-merge-fixes-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1331/newren/misc-merge-fixes-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1331 -- gitgitgadget
