Skip to content

Commit 2da3e9c

Browse files
simon-javiersteveklabnik
authored andcommitted
fix: correct typo in comment from "merge two branches" to "merge three branches"
1 parent 1533611 commit 2da3e9c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/branching-merging-and-conflicts/merging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Parent commit : yykpmnuq 210283e8 (empty) add better documentation
115115
Parent commit : xrslwzvq a70d464c (empty) create hello and goodbye functions
116116
$ jj log --limit 6
117117
@ vuztuxmz steve@steveklabnik.com 2024-03-01 15:38:49.000 -06:00 717232df
118-
├─┬─╮ (empty) merge two branches
118+
├─┬─╮ (empty) merge three branches
119119
│ │ ◉ xrslwzvq steve@steveklabnik.com 2024-02-29 23:06:23.000 -06:00 a70d464c
120120
│ │ │ (empty) create hello and goodbye functions
121121
│ ◉ │ yykpmnuq steve@steveklabnik.com 2024-02-29 23:03:22.000 -06:00 210283e8

0 commit comments

Comments
 (0)