// Copyright 2022 The Jujutsu Authors//// Licensed under the Apache License, Version 2.0 (the "License");// you may not use this file except in compliance with the License.// You may obtain a copy of the License at//// https://www.apache.org/licenses/LICENSE-2.0//// Unless required by applicable law or agreed to in writing, software// distributed under the License is distributed on an "AS IS" BASIS,// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.// See the License for the specific language governing permissions and// limitations under the License. use crate::common::TestEnvironment;use crate::common::to_toml_value; #[test]fn test_evolog_with_or_without_diff() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.write_file("file1", "foo\n");    work_dir.run_jj(["new", "-m", "my description"]).success();    work_dir.write_file("file1", "foo\nbar\n");    work_dir.write_file("file2", "foo\n");    work_dir        .run_jj(["rebase", "-r", "@", "-o", "root()"])        .success();    work_dir.write_file("file1", "resolved\n");     let output = work_dir.run_jj(["evolog"]);    insta::assert_snapshot!(output, @"    @  rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace    │  my description    │  -- operation 6db8cd4108b4 snapshot working copy    ×  rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)    │  my description    │  -- operation 631cc2c28fbc rebase commit 51e08f95160c897080d035d330aead3ee6ed5588    ○  rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)    │  my description    │  -- operation 826347115e2d snapshot working copy    ○  rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)       (empty) my description       -- operation e0f8e58b3800 new empty commit    [EOF]    ");     // Color    let output = work_dir.run_jj(["--color=always", "evolog"]);    insta::assert_snapshot!(output, @"    @  rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace    │  my description    │  -- operation 6db8cd4108b4 snapshot working copy    ×  rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)    │  my description    │  -- operation 631cc2c28fbc rebase commit 51e08f95160c897080d035d330aead3ee6ed5588    ○  rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)    │  my description    │  -- operation 826347115e2d snapshot working copy    ○  rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)       (empty) my description       -- operation e0f8e58b3800 new empty commit    [EOF]    ");     // There should be no diff caused by the rebase because it was a pure rebase    // (even even though it resulted in a conflict).    let output = work_dir.run_jj(["evolog", "-p"]);    insta::assert_snapshot!(output, @r#"    @  rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace    │  my description    │  -- operation 6db8cd4108b4 snapshot working copy    │  Resolved conflict in file1:    │     1     : <<<<<<< conflict 1 of 1    │     2     : %%%%%%% diff from: qpvuntsm c664a51b (parents of rebased revision)    │     3     : \\\\\\\        to: zzzzzzzz 00000000 (rebase destination)    │     4     : -foo    │     5     : +++++++ rlvkpnrz 51e08f95 "my description" (rebased revision)    │     6     : foo    │     7     : bar    │     8    1: >>>>>>> conflict 1 of 1 endsresolved    ×  rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)    │  my description    │  -- operation 631cc2c28fbc rebase commit 51e08f95160c897080d035d330aead3ee6ed5588    ○  rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)    │  my description    │  -- operation 826347115e2d snapshot working copy    │  Modified regular file file1:    │     1    1: foo    │          2: bar    │  Added regular file file2:    │          1: foo    ○  rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)       (empty) my description       -- operation e0f8e58b3800 new empty commit       Modified commit description:               1: my description    [EOF]    "#);     // Multiple starting revisions    let output = work_dir.run_jj(["evolog", "-r.."]);    insta::assert_snapshot!(output, @"    @  rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace    │  my description    │  -- operation 6db8cd4108b4 snapshot working copy    ×  rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)    │  my description    │  -- operation 631cc2c28fbc rebase commit 51e08f95160c897080d035d330aead3ee6ed5588    ○  rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)    │  my description    │  -- operation 826347115e2d snapshot working copy    ○  rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)       (empty) my description       -- operation e0f8e58b3800 new empty commit    ○  qpvuntsm test.user@example.com 2001-02-03 08:05:08 c664a51b    │  (no description set)    │  -- operation ca1226de0084 snapshot working copy    ○  qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)       (empty) (no description set)       -- operation 8f47435a3990 add workspace 'default'    [EOF]    ");     // Test `--limit`    let output = work_dir.run_jj(["evolog", "--limit=2"]);    insta::assert_snapshot!(output, @"    @  rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace    │  my description    │  -- operation 6db8cd4108b4 snapshot working copy    ×  rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)    │  my description    │  -- operation 631cc2c28fbc rebase commit 51e08f95160c897080d035d330aead3ee6ed5588    [EOF]    ");     // Test `--no-graph`    let output = work_dir.run_jj(["evolog", "--no-graph"]);    insta::assert_snapshot!(output, @"    rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace    my description    -- operation 6db8cd4108b4 snapshot working copy    rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)    my description    -- operation 631cc2c28fbc rebase commit 51e08f95160c897080d035d330aead3ee6ed5588    rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)    my description    -- operation 826347115e2d snapshot working copy    rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)    (empty) my description    -- operation e0f8e58b3800 new empty commit    [EOF]    ");     // Test `--git` format, and that it implies `-p`    let output = work_dir.run_jj(["evolog", "--no-graph", "--git"]);    insta::assert_snapshot!(output, @r#"    rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace    my description    -- operation 6db8cd4108b4 snapshot working copy    diff --git a/file1 b/file1    index 0000000000..2ab19ae607 100644    --- a/file1    +++ b/file1    @@ -1,8 +1,1 @@    -<<<<<<< conflict 1 of 1    -%%%%%%% diff from: qpvuntsm c664a51b (parents of rebased revision)    -\\\\\\\        to: zzzzzzzz 00000000 (rebase destination)    --foo    -+++++++ rlvkpnrz 51e08f95 "my description" (rebased revision)    -foo    -bar    ->>>>>>> conflict 1 of 1 ends    +resolved    rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)    my description    -- operation 631cc2c28fbc rebase commit 51e08f95160c897080d035d330aead3ee6ed5588    rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)    my description    -- operation 826347115e2d snapshot working copy    diff --git a/file1 b/file1    index 257cc5642c..3bd1f0e297 100644    --- a/file1    +++ b/file1    @@ -1,1 +1,2 @@     foo    +bar    diff --git a/file2 b/file2    new file mode 100644    index 0000000000..257cc5642c    --- /dev/null    +++ b/file2    @@ -0,0 +1,1 @@    +foo    rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)    (empty) my description    -- operation e0f8e58b3800 new empty commit    diff --git a/JJ-COMMIT-DESCRIPTION b/JJ-COMMIT-DESCRIPTION    --- JJ-COMMIT-DESCRIPTION    +++ JJ-COMMIT-DESCRIPTION    @@ -0,0 +1,1 @@    +my description    [EOF]    "#);} #[test]fn test_evolog_template() {    let test_env = TestEnvironment::default();     test_env        .run_jj_in(".", ["git", "init", "--colocate", "origin"])        .success();    let origin_dir = test_env.work_dir("origin");    origin_dir        .run_jj(["bookmark", "set", "-r@", "main"])        .success();     test_env        .run_jj_in(".", ["git", "clone", "origin", "local"])        .success();    let work_dir = test_env.work_dir("local");     // default template with operation    let output = work_dir.run_jj(["evolog", "-r@"]);    insta::assert_snapshot!(output, @"    @  kkmpptxz test.user@example.com 2001-02-03 08:05:09 2b17ac71       (empty) (no description set)       -- operation 2931515731a6 add workspace 'default'    [EOF]    ");    let output = work_dir.run_jj(["evolog", "-r@", "--color=debug"]);    insta::assert_snapshot!(output, @"    <<evolog commit node working_copy mutable::@>>  <<evolog working_copy mutable commit change_id shortest prefix::k>><<evolog working_copy mutable commit change_id shortest rest::kmpptxz>><<evolog working_copy mutable:: >><<evolog working_copy mutable commit author email local::test.user>><<evolog working_copy mutable commit author email::@>><<evolog working_copy mutable commit author email domain::example.com>><<evolog working_copy mutable:: >><<evolog working_copy mutable commit committer timestamp local format::2001-02-03 08:05:09>><<evolog working_copy mutable:: >><<evolog working_copy mutable commit commit_id shortest prefix::2>><<evolog working_copy mutable commit commit_id shortest rest::b17ac71>><<evolog working_copy mutable::>>       <<evolog working_copy mutable empty::(empty)>><<evolog working_copy mutable:: >><<evolog working_copy mutable empty description placeholder::(no description set)>><<evolog working_copy mutable::>>       <<evolog separator::-->><<evolog:: operation >><<evolog operation id short::2931515731a6>><<evolog:: >><<evolog operation description first_line::add workspace 'default'>><<evolog::>>    [EOF]    ");     // default template without operation    let output = work_dir.run_jj(["evolog", "-rmain@origin"]);    insta::assert_snapshot!(output, @"    ◆  qpvuntsm test.user@example.com 2001-02-03 08:05:07 main@origin e8849ae1       (empty) (no description set)    [EOF]    ");    let output = work_dir.run_jj(["evolog", "-rmain@origin", "--color=debug"]);    insta::assert_snapshot!(output, @"    <<evolog commit node immutable::◆>>  <<evolog immutable commit change_id shortest prefix::q>><<evolog immutable commit change_id shortest rest::pvuntsm>><<evolog immutable:: >><<evolog immutable commit author email local::test.user>><<evolog immutable commit author email::@>><<evolog immutable commit author email domain::example.com>><<evolog immutable:: >><<evolog immutable commit committer timestamp local format::2001-02-03 08:05:07>><<evolog immutable:: >><<evolog immutable commit bookmarks name::main>><<evolog immutable commit bookmarks::@>><<evolog immutable commit bookmarks remote::origin>><<evolog immutable:: >><<evolog immutable commit commit_id shortest prefix::e>><<evolog immutable commit commit_id shortest rest::8849ae1>><<evolog immutable::>>       <<evolog immutable empty::(empty)>><<evolog immutable:: >><<evolog immutable empty description placeholder::(no description set)>><<evolog immutable::>>    [EOF]    ");     // default template with root commit    let output = work_dir.run_jj(["evolog", "-rroot()"]);    insta::assert_snapshot!(output, @"    ◆  zzzzzzzz root() 00000000    [EOF]    ");    let output = work_dir.run_jj(["evolog", "-rroot()", "--color=debug"]);    insta::assert_snapshot!(output, @"    <<evolog commit node immutable::◆>>  <<evolog immutable commit change_id shortest prefix::z>><<evolog immutable commit change_id shortest rest::zzzzzzz>><<evolog immutable:: >><<evolog immutable root::root()>><<evolog immutable:: >><<evolog immutable commit commit_id shortest prefix::0>><<evolog immutable commit commit_id shortest rest::0000000>><<evolog immutable::>>    [EOF]    ");     // JSON output with operation    let output = work_dir.run_jj(["evolog", "-r@", "-Tjson(self)", "--no-graph"]);    insta::assert_snapshot!(output, @r#"{"commit":{"commit_id":"2b17ac719c7db025e2514f5708d2b0328fc6b268","parents":["0000000000000000000000000000000000000000"],"change_id":"kkmpptxzrspxrzommnulwmwkkqwworpl","description":"","author":{"name":"Test User","email":"test.user@example.com","timestamp":"2001-02-03T04:05:09+07:00"},"committer":{"name":"Test User","email":"test.user@example.com","timestamp":"2001-02-03T04:05:09+07:00"}},"operation":{"id":"2931515731a6903101194e8e889efb13f7494077d8ec2650e2ec40ad69c32fe45385a3d333d1792ffbc410655f1e98daa404f709062a7908bc0b03a0241825bc","parents":["00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"],"time":{"start":"2001-02-03T04:05:09+07:00","end":"2001-02-03T04:05:09+07:00"},"description":"add workspace 'default'","hostname":"host.example.com","username":"test-username","is_snapshot":false,"tags":{}}}[EOF]"#);     // JSON output without operation    let output = work_dir.run_jj(["evolog", "-rmain@origin", "-Tjson(self)", "--no-graph"]);    insta::assert_snapshot!(output, @r#"{"commit":{"commit_id":"e8849ae12c709f2321908879bc724fdb2ab8a781","parents":["0000000000000000000000000000000000000000"],"change_id":"qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu","description":"","author":{"name":"Test User","email":"test.user@example.com","timestamp":"2001-02-03T04:05:07+07:00"},"committer":{"name":"Test User","email":"test.user@example.com","timestamp":"2001-02-03T04:05:07+07:00"}},"operation":null}[EOF]"#);} #[test]fn test_evolog_with_custom_symbols() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.write_file("file1", "foo\n");    work_dir.run_jj(["new", "-m", "my description"]).success();    work_dir.write_file("file1", "foo\nbar\n");    work_dir.write_file("file2", "foo\n");    work_dir        .run_jj(["rebase", "-r", "@", "-o", "root()"])        .success();    work_dir.write_file("file1", "resolved\n");     let config = "templates.log_node='if(current_working_copy, \"$\", \"┝\")'";    let output = work_dir.run_jj(["evolog", "--config", config]);     insta::assert_snapshot!(output, @"    $  rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace    │  my description    │  -- operation 7710a1e21552 snapshot working copy    ┝  rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)    │  my description    │  -- operation 631cc2c28fbc rebase commit 51e08f95160c897080d035d330aead3ee6ed5588    ┝  rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)    │  my description    │  -- operation 826347115e2d snapshot working copy    ┝  rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)       (empty) my description       -- operation e0f8e58b3800 new empty commit    [EOF]    ");} #[test]fn test_evolog_word_wrap() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");    let render = |args: &[&str], columns: u32, word_wrap: bool| {        let word_wrap = to_toml_value(word_wrap);        work_dir.run_jj_with(|cmd| {            cmd.args(args)                .arg(format!("--config=ui.log-word-wrap={word_wrap}"))                .env("COLUMNS", columns.to_string())        })    };     work_dir.run_jj(["describe", "-m", "first"]).success();     // ui.log-word-wrap option applies to both graph/no-graph outputs    insta::assert_snapshot!(render(&["evolog"], 40, false), @"    @  qpvuntsm test.user@example.com 2001-02-03 08:05:08 68a50538    │  (empty) first    │  -- operation 75545f7ff2df describe commit e8849ae12c709f2321908879bc724fdb2ab8a781    ○  qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)       (empty) (no description set)       -- operation 8f47435a3990 add workspace 'default'    [EOF]    ");    insta::assert_snapshot!(render(&["evolog"], 40, true), @"    @  qpvuntsm test.user@example.com    │  2001-02-03 08:05:08 68a50538    │  (empty) first    │  -- operation 75545f7ff2df describe    │  commit    │  e8849ae12c709f2321908879bc724fdb2ab8a781    ○  qpvuntsm/1 test.user@example.com       2001-02-03 08:05:07 e8849ae1 (hidden)       (empty) (no description set)       -- operation 8f47435a3990 add       workspace 'default'    [EOF]    ");    insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, false), @"    qpvuntsm test.user@example.com 2001-02-03 08:05:08 68a50538    (empty) first    -- operation 75545f7ff2df describe commit e8849ae12c709f2321908879bc724fdb2ab8a781    qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)    (empty) (no description set)    -- operation 8f47435a3990 add workspace 'default'    [EOF]    ");    insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, true), @"    qpvuntsm test.user@example.com    2001-02-03 08:05:08 68a50538    (empty) first    -- operation 75545f7ff2df describe    commit    e8849ae12c709f2321908879bc724fdb2ab8a781    qpvuntsm/1 test.user@example.com    2001-02-03 08:05:07 e8849ae1 (hidden)    (empty) (no description set)    -- operation 8f47435a3990 add workspace    'default'    [EOF]    ");} #[test]fn test_evolog_squash() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.run_jj(["describe", "-m", "first"]).success();    work_dir.write_file("file1", "foo\n");    work_dir.run_jj(["new", "-m", "second"]).success();    work_dir.write_file("file1", "foo\nbar\n");     // not partial    work_dir.run_jj(["squash", "-m", "squashed 1"]).success();     work_dir.run_jj(["describe", "-m", "third"]).success();    work_dir.write_file("file1", "foo\nbar\nbaz\n");    work_dir.write_file("file2", "foo2\n");    work_dir.write_file("file3", "foo3\n");     // partial    work_dir        .run_jj(["squash", "-m", "squashed 2", "file1"])        .success();     work_dir.run_jj(["new", "-m", "fourth"]).success();    work_dir.write_file("file4", "foo4\n");     work_dir.run_jj(["new", "-m", "fifth"]).success();    work_dir.write_file("file5", "foo5\n");     // multiple sources    work_dir        .run_jj([            "squash",            "-msquashed 3",            "--from=subject(fourth)|subject(fifth)",            "--into=subject(squash*)",        ])        .success();     let output = work_dir.run_jj(["evolog", "-p", "-rsubject(squash*)"]);    insta::assert_snapshot!(output, @r"    ○      qpvuntsm test.user@example.com 2001-02-03 08:05:15 5f3281c6    ├─┬─╮  squashed 3    │ │ │  -- operation 69ecc16188a1 squash commits into 5ec0619af5cb4f7707a556a71a6f96af0bc294d2    │ │ │  Modified commit description:    │ │ │     1     : <<<<<<< conflict 1 of 1    │ │ │     2     : +++++++ side #1    │ │ │     3    1: squashed 2    │ │ │     4     : %%%%%%% diff from: base #1    │ │ │     5     : \\\\\\\        to: side #2    │ │ │     6     : +fourth    │ │ │     7     : %%%%%%% diff from: base #2    │ │ │     8    1: \\\\\\\        to: side #3    │ │ │     9     : +fifth    │ │ │    10     : >>>>>>> conflict 1 of 1 ends    │ │ ○  vruxwmqv/0 test.user@example.com 2001-02-03 08:05:15 770795d0 (hidden)    │ │ │  fifth    │ │ │  -- operation b22b0aceb94e snapshot working copy    │ │ │  Added regular file file5:    │ │ │          1: foo5    │ │ ○  vruxwmqv/1 test.user@example.com 2001-02-03 08:05:14 2e0123d1 (hidden)    │ │    (empty) fifth    │ │    -- operation fc852ed87801 new empty commit    │ │    Modified commit description:    │ │            1: fifth    │ ○  yqosqzyt/0 test.user@example.com 2001-02-03 08:05:14 ea8161b6 (hidden)    │ │  fourth    │ │  -- operation 3b09d55dfa6e snapshot working copy    │ │  Added regular file file4:    │ │          1: foo4    │ ○  yqosqzyt/1 test.user@example.com 2001-02-03 08:05:13 1de5fdb6 (hidden)    │    (empty) fourth    │    -- operation 9404a551035a new empty commit    │    Modified commit description:    │            1: fourth    ○    qpvuntsm/1 test.user@example.com 2001-02-03 08:05:12 5ec0619a (hidden)    ├─╮  squashed 2    │ │  -- operation fa9796d12627 squash commits into 690858846504af0e42fde980fdacf9851559ebb8    │ │  Modified commit description:    │ │     1     : <<<<<<< conflict 1 of 1    │ │     2     : +++++++ side #1    │ │     3    1: squashed 1    │ │     4     : %%%%%%% diff from: base    │ │     5    1: \\\\\\\        to: side #2    │ │     6     : +third    │ │     7     : >>>>>>> conflict 1 of 1 ends    │ │  Removed regular file file2:    │ │     1     : foo2    │ │  Removed regular file file3:    │ │     1     : foo3    │ ○  zsuskuln/3 test.user@example.com 2001-02-03 08:05:12 cce957f1 (hidden)    │ │  third    │ │  -- operation de96267cd621 snapshot working copy    │ │  Modified regular file file1:    │ │     1    1: foo    │ │     2    2: bar    │ │          3: baz    │ │  Added regular file file2:    │ │          1: foo2    │ │  Added regular file file3:    │ │          1: foo3    │ ○  zsuskuln/4 test.user@example.com 2001-02-03 08:05:11 3a2a4253 (hidden)    │ │  (empty) third    │ │  -- operation 4611a6121e8a describe commit ebec10f449ad7ab92c7293efab5e3db2d8e9fea1    │ │  Modified commit description:    │ │          1: third    │ ○  zsuskuln/5 test.user@example.com 2001-02-03 08:05:10 ebec10f4 (hidden)    │    (empty) (no description set)    │    -- operation 65c81703100d squash commits into 5878cbe03cdf599c9353e5a1a52a01f4c5e0e0fa    ○    qpvuntsm/2 test.user@example.com 2001-02-03 08:05:10 69085884 (hidden)    ├─╮  squashed 1    │ │  -- operation 65c81703100d squash commits into 5878cbe03cdf599c9353e5a1a52a01f4c5e0e0fa    │ │  Modified commit description:    │ │     1     : <<<<<<< conflict 1 of 1    │ │     2     : %%%%%%% diff from: base    │ │     3     : \\\\\\\        to: side #1    │ │     4     : +first    │ │     5     : +++++++ side #2    │ │     6     : second    │ │     7     : >>>>>>> conflict 1 of 1 ends    │ │          1: squashed 1    │ ○  kkmpptxz/0 test.user@example.com 2001-02-03 08:05:10 a3759c9d (hidden)    │ │  second

Lines 1–500 of 825. Load more