progit
diff --git a/‎book/07-git-tools/1-git-tools.asc‎
Lines changed: 1 addition & 1 deletion b/‎book/07-git-tools/1-git-tools.asc‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎book/07-git-tools/sections/undoing-merges.asc‎
Lines changed: 0 additions & 85 deletions b/‎book/07-git-tools/sections/undoing-merges.asc‎
Lines changed: 0 additions & 85 deletions
@@ -19,7 +19,7 @@ include::sections/rewriting-history.asc[]
 
 include::sections/reset.asc[]
 
-include::sections/undoing-merges.asc[]
+include::sections/advanced-merging.asc[]
 
 include::sections/debugging.asc[]