From 5b8b62992d848319d88770c727cb47545faf9587 Mon Sep 17 00:00:00 2001 From: Julien Brun Date: Tue, 20 Aug 2024 09:12:38 -0700 Subject: [PATCH] better code chunk formatting --- day1-git-collaboration-conflicts.qmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/day1-git-collaboration-conflicts.qmd b/day1-git-collaboration-conflicts.qmd index 87924b8..55a6a85 100644 --- a/day1-git-collaboration-conflicts.qmd +++ b/day1-git-collaboration-conflicts.qmd @@ -41,7 +41,7 @@ Sometimes you just made a mistake. When you get a merge conflict, the repositor is placed in a 'Merging' state until you resolve it. There's a command line command to abort doing the merge altogether: -``` +```bash git merge --abort ```