From aa56da853574fa6128b06cf53f5b6bdbc16d4534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bast.gerard@gmail.com>
Date: Mon, 25 Apr 2022 12:20:30 +0200
Subject: [PATCH] Document check-merge-conflict argument

Document --assume-in-merge in README
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7368831..2c8cf4f 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ Attempts to load all json files to verify syntax.
 
 #### `check-merge-conflict`
 Check for files that contain merge conflict strings.
+  - `--assume-in-merge` - Allows running the hook when there is no ongoing merge operation
 
 #### `check-shebang-scripts-are-executable`
 Checks that scripts with shebangs are executable.