From 951c5a7b7aec94f5b6db4bff00f4d79bc609b487 Mon Sep 17 00:00:00 2001 From: sonali Date: Sun, 15 Oct 2017 23:34:39 -0400 Subject: [PATCH] cleanup --- additional-material/resolving-merge-conflicts.md | 1 + 1 file changed, 1 insertion(+) diff --git a/additional-material/resolving-merge-conflicts.md b/additional-material/resolving-merge-conflicts.md index a64c6f2f1ec..66d11166c92 100644 --- a/additional-material/resolving-merge-conflicts.md +++ b/additional-material/resolving-merge-conflicts.md @@ -17,6 +17,7 @@ eg: ======= This is a fourth line I am adding >>>>>>> 4e2b407f501b68f8588aa645acafffa0224b9b78:mergetest +``` <<<<<<<: Indicates the start of the lines that had a merge conflict. The first set of lines are the lines from the file that you were trying to merge the changes into. =======: Indicates the break point used for comparison. Breaks up changes that user has committed (above) to changes coming from merge (below) to visually see the differences.