Merge branch 'jn/maint-sequencer-fixes'

diff --git a/branch.c b/branch.c
index a715a1174982970943ed2c4fc1c2ab4906699fdc..c2e625f40c9d77fa048b905ca4a3982da563b299 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -3,7 +3,6 @@
 #include "refs.h"
 #include "remote.h"
 #include "commit.h"
-#include "sequencer.h"
 
 struct tracking {
        struct refspec spec;
@@ -280,5 +279,4 @@ void remove_branch_state(void)
        unlink(git_path("MERGE_MSG"));
        unlink(git_path("MERGE_MODE"));
        unlink(git_path("SQUASH_MSG"));
-       remove_sequencer_state(0);
 }