diff options
| author | Stephan Dilly <dilly.stephan@gmail.com> | 2021-05-09 22:53:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 22:53:12 +0200 |
| commit | 4f6aceb3ec9a2631d795654381f6e9841d889743 (patch) | |
| tree | 115d40860f9a755e9886f3a48a1e22efc25e63b5 /src/queue.rs | |
| parent | 9f37835dc44f151c52769fc38686acb8eef41344 (diff) | |
merging a branch (#696)
* merging arbitrary branch
* cleanup intermediate in-merge state
Diffstat (limited to 'src/queue.rs')
| -rw-r--r-- | src/queue.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/queue.rs b/src/queue.rs index 131de065..a5226e51 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -33,6 +33,7 @@ pub enum Action { DeleteBranch(String), ForcePush(String, bool), PullMerge { incoming: usize, rebase: bool }, + AbortMerge, } /// |