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-27 17:30:04 -0500
commit0e3a7a84e6a90f3ff4ce22307239925d5bbca685 (patch)
tree2c5f50882f304f07bffbe32f2895cd57a7689ce2 /XD.1
parent68634537c043fae1f991302005c81f68a52a3eea (diff)
downloadXD-3.2.tar.gz
XD-3.2.tar.bz2
XD-3.2.zip
add new eyes for when the current repo is in the middle of a mergeHEADv3.2master
Diffstat (limited to 'XD.1')
-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