summaryrefslogtreecommitdiffstats
path: root/XD.1
diff options
context:
space:
mode:
authorSquibid <me@zacharyscheiman.com>2025-04-25 02:48:47 -0500
committerSquibid <me@zacharyscheiman.com>2025-04-25 02:50:44 -0500
commit0c02943125b0f3bbb8754bcb6b73bd927b39de69 (patch)
tree7b31d1afaccec12b99ca4e54323fe636ccff41b0 /XD.1
parent68634537c043fae1f991302005c81f68a52a3eea (diff)
downloadXD-0c02943125b0f3bbb8754bcb6b73bd927b39de69.tar.gz
XD-0c02943125b0f3bbb8754bcb6b73bd927b39de69.tar.bz2
XD-0c02943125b0f3bbb8754bcb6b73bd927b39de69.zip
add new eyes for when the current repo is in the middle of a merge
Diffstat (limited to '')
-rw-r--r--XD.11
1 files changed, 1 insertions, 0 deletions
diff --git a/XD.1 b/XD.1
index 65361c0..47254d8 100644
--- a/XD.1
+++ b/XD.1
@@ -24,6 +24,7 @@ c;l.
:;default
\;;in a git repo
8;in a git repo with stashed changes
+ X;in a git repo during a merge
B;in a git repo with no commits
.TE
.Ss Nose