From c8a2d5de1a7efe9573f55a8735a2e204a52c0931 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Thu, 11 Dec 2014 17:35:02 -0800
Subject: [PATCH] CR feedback.

---
 src/compiler/scanner.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 357e04b7004..9853e22d9f1 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -371,6 +371,7 @@ module ts {
                         continue;
                     }
                     break;
+
                 case CharacterCodes.lessThan:
                 case CharacterCodes.equals:
                 case CharacterCodes.greaterThan:
@@ -378,7 +379,8 @@ module ts {
                         pos = scanConflictMarkerTrivia(text, pos);
                         continue;
                     }
-                    // fall through
+                    break;
+
                 default:
                     if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpace(ch) || isLineBreak(ch))) {
                         pos++;
@@ -395,8 +397,8 @@ module ts {
         if (pos > 0 && isLineBreak(text.charCodeAt(pos - 1))) {
             var ch = text.charCodeAt(pos);
 
-            // All conflict markers the same character repeated seven times.  If it is a 
-            // <<<<<<< or >>>>>>> marker then it is also followd by a space.
+            // All conflict markers consist of the same character repeated seven times.  If it is 
+            // a <<<<<<< or >>>>>>> marker then it is also followd by a space.
             var markerLength = "<<<<<<<".length;
 
             if ((pos + markerLength) < text.length) {