Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'book/src/themes.md')
-rw-r--r--book/src/themes.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/book/src/themes.md b/book/src/themes.md
index 29a8c4ba..0a49053f 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -251,6 +251,7 @@ We use a similar set of scopes as
- `gutter` - gutter indicator
- `delta` - modifications
- `moved` - renamed or moved files/changes
+ - `conflict` - merge conflicts
- `gutter` - gutter indicator
#### Interface