Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / branch.c

diff --git a/branch.c b/branch.c
index 579494738a7f804974d2b396a1c795acd4a44789..2d9e7675a6ed24bd70165a78386ad5a6589a3b50 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -344,6 +344,7 @@ void remove_merge_branch_state(struct repository *r)
        unlink(git_path_merge_rr(r));
        unlink(git_path_merge_msg(r));
        unlink(git_path_merge_mode(r));
+       save_autostash(git_path_merge_autostash(r));
 }
 
 void remove_branch_state(struct repository *r, int verbose)