From 740ef7edf71ce6ddea3f7583c8b0b90b8ae26c24 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 26 Sep 2016 16:18:10 +0400
Subject: [PATCH] handle git conflict status in terminal hover_link

---
 plugins/c9.ide.terminal/aceterm/hover_link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.ide.terminal/aceterm/hover_link.js b/plugins/c9.ide.terminal/aceterm/hover_link.js
index 2296476e..b46c5768 100644
--- a/plugins/c9.ide.terminal/aceterm/hover_link.js
+++ b/plugins/c9.ide.terminal/aceterm/hover_link.js
@@ -309,7 +309,7 @@ var HoverLink = function(editor) {
         else if (prompt.command === "git") { // git status
             var prefix = line.substr(0, match.start);
             if (match.start + value.length == line.length
-                && /^(#|[ MDR?A]{2})\s+([\w\s]+:\s+)?$/.test(prefix)
+                && /^(#|[ MDRU?A]{2})\s+([\w\s]+:\s+)?$/.test(prefix)
             ) {
                 match.type = "path";
             } else {