File tree Expand file tree Collapse file tree
src/branching-merging-and-conflicts Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -106,12 +106,11 @@ $ jj log --limit 5
106106That's right, we can undo our last command with a simple ` jj undo ` . We'll talk
107107about it more in the future. But for now, it's like our merge never happened.
108108
109- Let's try merging both in at the same time:
109+ Let's try merging all three in at the same time:
110110
111111``` console
112- $ jj new pzoqtwuv yykpmnuq xrslwzvq -m " merge two branches"
113- Working copy now at: vuztuxmz 717232df (empty) merge two branches
114- Parent commit : pzoqtwuv 9353442b (empty) added some cool new feature
112+ $ jj new pzoqtwuv yykpmnuq xrslwzvq -m " merge three branches"
113+ Working copy now at: pzoqtwuv 9353442b (empty) added some cool new feature
115114Parent commit : yykpmnuq 210283e8 (empty) add better documentation
116115Parent commit : xrslwzvq a70d464c (empty) create hello and goodbye functions
117116$ jj log --limit 6
You can’t perform that action at this time.
0 commit comments