include merge commits in the file history

Author: emanuel-v-r

LibGit2Sharp.Tests/FileHistoryFixture.cs

@@ -104,11 +104,11 @@ public void CanFollowBranches(string specificRepoPath)
                 var timeCommits = new List<Commit>
                 {
                     master10, // master
-
+                    master9, // merge to master
                     master8, // master
                     nextfix7, // next-fix
                     master6, // master
-
+                    master5, // merge to master
                     master4, // master
                     fix3, // fix
                     master2, // master
@@ -123,11 +123,11 @@ public void CanFollowBranches(string specificRepoPath)
                 var topoCommits = new List<Commit>
                 {
                     master10, // master
-
+                    master9, // merge to master
                     nextfix7, // next-fix
                     master8, // master
                     master6, // master
-
+                    master5, // merge to master
                     fix3, // fix
                     fix1, // fix
                     master4, // master

LibGit2Sharp/Core/FileHistory.cs

@@ -134,12 +134,7 @@ private static IEnumerable<LogEntry> FullHistory(IRepository repo, string path,
                 {
                     DetermineParentPaths(repo, currentCommit, currentPath, map);
 
-                    if (parentCount != 1)
-                    {
-                        continue;
-                    }
-
-                    var parentCommit = currentCommit.Parents.Single();
+                    var parentCommit = currentCommit.Parents.First();
                     var parentPath = map[parentCommit];
                     var parentTreeEntry = parentCommit.Tree[parentPath];