graph: smooth appearance of collapsing edges on commit lines

[thirdparty/git.git] / t / t4214-log-graph-octopus.sh

diff --git a/t/t4214-log-graph-octopus.sh b/t/t4214-log-graph-octopus.sh
index 1b96276894ab5179ebda00d6f8a5e11afcfa1a69..21bc600a82d442eeef8420ea506cd795ed8beb8d 100755 (executable)
--- a/t/t4214-log-graph-octopus.sh
+++ b/t/t4214-log-graph-octopus.sh
@@ -31,9 +31,9 @@ test_expect_success 'log --graph with tricky octopus merge, no color' '
        | | | * 4
        | | * | 3
        | | |/
-       | * | 2
+       | * / 2
        | |/
-       * | 1
+       * / 1
        |/
        * initial
        EOF
@@ -51,9 +51,9 @@ test_expect_success 'log --graph with tricky octopus merge with colors' '
        <RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
        <RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
        <RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-       <RED>|<RESET> * <MAGENTA>|<RESET> 2
+       <RED>|<RESET> * <MAGENTA>/<RESET> 2
        <RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-       * <MAGENTA>|<RESET> 1
+       * <MAGENTA>/<RESET> 1
        <MAGENTA>|<RESET><MAGENTA>/<RESET>
        * initial
        EOF
@@ -72,9 +72,9 @@ test_expect_success 'log --graph with normal octopus merge, no color' '
        | | | * 4
        | | * | 3
        | | |/
-       | * | 2
+       | * / 2
        | |/
-       * | 1
+       * / 1
        |/
        * initial
        EOF
@@ -90,9 +90,9 @@ test_expect_success 'log --graph with normal octopus merge with colors' '
        <RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4
        <RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3
        <RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-       <RED>|<RESET> * <BLUE>|<RESET> 2
+       <RED>|<RESET> * <BLUE>/<RESET> 2
        <RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-       * <BLUE>|<RESET> 1
+       * <BLUE>/<RESET> 1
        <BLUE>|<RESET><BLUE>/<RESET>
        * initial
        EOF
@@ -110,9 +110,9 @@ test_expect_success 'log --graph with normal octopus merge and child, no color'
        | | | * 4
        | | * | 3
        | | |/
-       | * | 2
+       | * / 2
        | |/
-       * | 1
+       * / 1
        |/
        * initial
        EOF
@@ -129,9 +129,9 @@ test_expect_failure 'log --graph with normal octopus and child merge with colors
        <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
        <GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
        <GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-       <GREEN>|<RESET> * <MAGENTA>|<RESET> 2
+       <GREEN>|<RESET> * <MAGENTA>/<RESET> 2
        <GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-       * <MAGENTA>|<RESET> 1
+       * <MAGENTA>/<RESET> 1
        <MAGENTA>|<RESET><MAGENTA>/<RESET>
        * initial
        EOF
@@ -150,9 +150,9 @@ test_expect_success 'log --graph with tricky octopus merge and its child, no col
        | | | * 4
        | | * | 3
        | | |/
-       | * | 2
+       | * / 2
        | |/
-       * | 1
+       * / 1
        |/
        * initial
        EOF
@@ -171,9 +171,9 @@ test_expect_failure 'log --graph with tricky octopus merge and its child with co
        <RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
        <RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3
        <RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-       <RED>|<RESET> * <CYAN>|<RESET> 2
+       <RED>|<RESET> * <CYAN>/<RESET> 2
        <RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-       * <CYAN>|<RESET> 1
+       * <CYAN>/<RESET> 1
        <CYAN>|<RESET><CYAN>/<RESET>
        * initial
        EOF