apply: register conflicted stages to the index

diff --git a/t/t9002-column.sh b/t/t9002-column.sh
index ec288aeb95e70d9f9e47ce28284a89b8497d0bca..89983527b62f1d6c330edaf2f50c70ce735b0c1e 100755 (executable)
--- a/t/t9002-column.sh
+++ b/t/t9002-column.sh
@@ -50,8 +50,7 @@ EOF
        test_cmp expected actual
 '
 
-test_expect_success 'COLUMNS = 1' '
-       cat >expected <<\EOF &&
+cat >expected <<\EOF
 one
 two
 three
@@ -64,6 +63,8 @@ nine
 ten
 eleven
 EOF
+
+test_expect_success COLUMNS_CAN_BE_1 'COLUMNS = 1' '
        COLUMNS=1 git column --mode=column <lista >actual &&
        test_cmp expected actual
 '
@@ -89,6 +90,30 @@ EOF
        test_cmp expected actual
 '
 
+test_expect_success '20 columns, nodense' '
+       cat >expected <<\EOF &&
+one    seven
+two    eight
+three  nine
+four   ten
+five   eleven
+six
+EOF
+       git column --mode=column,nodense < lista > actual &&
+       test_cmp expected actual
+'
+
+test_expect_success '20 columns, dense' '
+       cat >expected <<\EOF &&
+one   five  nine
+two   six   ten
+three seven eleven
+four  eight
+EOF
+       git column --mode=column,dense < lista > actual &&
+       test_cmp expected actual
+'
+
 test_expect_success '20 columns, padding 2' '
        cat >expected <<\EOF &&
 one     seven
@@ -128,4 +153,28 @@ EOF
        test_cmp expected actual
 '
 
+test_expect_success '20 columns, row first, nodense' '
+       cat >expected <<\EOF &&
+one    two
+three  four
+five   six
+seven  eight
+nine   ten
+eleven
+EOF
+       git column --mode=row,nodense <lista >actual &&
+       test_cmp expected actual
+'
+
+test_expect_success '20 columns, row first, dense' '
+       cat >expected <<\EOF &&
+one   two    three
+four  five   six
+seven eight  nine
+ten   eleven
+EOF
+       git column --mode=row,dense <lista >actual &&
+       test_cmp expected actual
+'
+
 test_done