File history walk: include merge commit if trees have changed

ianhattendorf · ianhattendorf · commit e3ed916e498c · 2019-05-16T17:47:02.000-07:00
diff --git a/test/tests/revwalk.js b/test/tests/revwalk.js
@@ -234,6 +234,7 @@ describe("Revwalk", function() {
         });
 
         magicShas = [
+          "be6905d459f1b236e44b2445df25aff1783993e9",
           "4a34168b80fe706f52417106821c9cbfec630e47",
           "f80e085e3118bbd6aad49dad7c53bdc37088bf9b",
           "694b2d703a02501f288269bea7d1a5d643a83cc8",
