From edc2bf208e05ec93f98d6d0490c00778ae5790c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dragan=20Filipovi=C4=87?= <info@frontenddot.com>
Date: Sun, 25 Jun 2017 11:17:56 +0200
Subject: [PATCH] [comments] Change wrong param name in description (#1018)

---
 lib/util/conflicter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/conflicter.js b/lib/util/conflicter.js
index 8454b11d..7cb689b2 100644
--- a/lib/util/conflicter.js
+++ b/lib/util/conflicter.js
@@ -61,7 +61,7 @@ class Conflicter {
    *   - `Y` Yes, overwrite
    *   - `n` No, do not overwrite
    *   - `a` All, overwrite this and all others
-   *   - `q` Quit, abort
+   *   - `x` Exit, abort
    *   - `d` Diff, show the differences between the old and the new
    *   - `h` Help, show this help
    *