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