1 parent 1533611 commit 2da3e9cCopy full SHA for 2da3e9c
1 file changed
src/branching-merging-and-conflicts/merging.md
@@ -115,7 +115,7 @@ Parent commit : yykpmnuq 210283e8 (empty) add better documentation
115
Parent commit : xrslwzvq a70d464c (empty) create hello and goodbye functions
116
$ jj log --limit 6
117
@ vuztuxmz steve@steveklabnik.com 2024-03-01 15:38:49.000 -06:00 717232df
118
-├─┬─╮ (empty) merge two branches
+├─┬─╮ (empty) merge three branches
119
│ │ ◉ xrslwzvq steve@steveklabnik.com 2024-02-29 23:06:23.000 -06:00 a70d464c
120
│ │ │ (empty) create hello and goodbye functions
121
│ ◉ │ yykpmnuq steve@steveklabnik.com 2024-02-29 23:03:22.000 -06:00 210283e8
0 commit comments