Merge branch 'fc/rerere-conflict-style' into maint

diff --git a/column.c b/column.c
index 9367ba5db589e63b770c431121176ff046603d06..8d1ce88d1493cf18436b03f843c6d90190d47bb2 100644 (file)
--- a/column.c
+++ b/column.c
@@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char *value)
                value += strspn(value, sep);
        }
        /*
-        * Setting layout implies "always" if neither always, never
-        * nor auto is specified.
+        * If none of "always", "never", and "auto" is specified, then setting
+        * layout implies "always".
         *
         * Current value in COL_ENABLE_MASK is disregarded. This means if
         * you set column.ui = auto and pass --column=row, then "auto"