From 06aa5dbb1fc74bf433f17a581cbd019612a36c09 Mon Sep 17 00:00:00 2001
From: Joshua Li <joshuali925@gmail.com>
Date: Wed, 5 Oct 2022 22:26:20 -0700
Subject: [PATCH] Include revert conflicts in git abort (#992)

---
 bin/git-abort      | 2 +-
 man/git-abort.1    | 2 +-
 man/git-abort.html | 2 +-
 man/git-abort.md   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/git-abort b/bin/git-abort
index abc3ed7..9c17380 100755
--- a/bin/git-abort
+++ b/bin/git-abort
@@ -3,7 +3,7 @@
 gitdir="$(git rev-parse --git-dir)" || exit
 opfound=
 fcnt=
-for i in cherry-pick merge rebase; do
+for i in cherry-pick merge rebase revert; do
   f=${i^^}
   f=${f/-/_}
   test -f "${gitdir}/${f}_HEAD" && fcnt=1$fcnt && opfound=$i
diff --git a/man/git-abort.1 b/man/git-abort.1
index a4704c0..cd998a2 100644
--- a/man/git-abort.1
+++ b/man/git-abort.1
@@ -6,7 +6,7 @@
 .SH "SYNOPSIS"
 \fBgit\-abort\fR
 .SH "DESCRIPTION"
-Abort current git rebase, merge or cherry\-pick process\.
+Abort current git revert, rebase, merge or cherry\-pick process\.
 .SH "OPTIONS"
 There are no options, it just aborts current operation\.
 .SH "EXAMPLES"
diff --git a/man/git-abort.html b/man/git-abort.html
index 697537a..983b28e 100644
--- a/man/git-abort.html
+++ b/man/git-abort.html
@@ -81,7 +81,7 @@
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>  Abort current git rebase, merge or cherry-pick process.</p>
+<p>  Abort current git revert, rebase, merge or cherry-pick process.</p>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
diff --git a/man/git-abort.md b/man/git-abort.md
index 0c865da..7f2ad64 100644
--- a/man/git-abort.md
+++ b/man/git-abort.md
@@ -7,7 +7,7 @@ git-abort(1) -- Abort current git operation
 
 ## DESCRIPTION
 
-  Abort current git rebase, merge or cherry-pick process.
+  Abort current git revert, rebase, merge or cherry-pick process.
 
 ## OPTIONS