From a79208de674e9ff6a7c8803d23ee18c5cca6d9e6 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Thu, 4 Jan 2018 01:40:54 -0500
Subject: [PATCH] Removes --no-merges from ref resolve

---
 src/git/git.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/git/git.ts b/src/git/git.ts
index fdfec89..6877957 100644
--- a/src/git/git.ts
+++ b/src/git/git.ts
@@ -415,7 +415,7 @@ export class Git {
 
     static async log_resolve(repoPath: string, fileName: string, ref: string) {
         try {
-            const data = await gitCommandCore({ cwd: repoPath }, `log`, `--full-history`, `-M`, `-n1`, `--no-merges`, `--format=%H`, ref, `--`, fileName);
+            const data = await gitCommandCore({ cwd: repoPath }, `log`, `--full-history`, `-M`, `-n1`, `--format=%H`, ref, `--`, fileName);
             return data.trim();
         }
         catch {