From e6a5711639a22a89ce6355771aa0f2bab9377b0e Mon Sep 17 00:00:00 2001 From: Adar Nimrod <nimrod@shore.co.il> Date: Tue, 13 Jun 2017 16:48:58 +0300 Subject: [PATCH] - A little more documentation. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d736671..d040ec1 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ Add the following to your project's `.pre-commit-config.yaml`: sha: v0.1.0 hooks: - id: merge-conflict + args: ['production'] # In case the branch to check against is NOT master. always_run: True ## License -- GitLab