support no range

(cherry picked from commit aa3aba7)
kellyselden · Oct 31, 2023 · fd4f3e3 · fd4f3e3
1 parent 0bc99ef
commit fd4f3e3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/index.js b/src/index.js
@@ -303,12 +303,12 @@ function fixtureCompare({
   function replaceConflictRevisions(tree) {
     for (let [path, textOrDir] of Object.entries(tree)) {
       if (typeof textOrDir === 'string') {
-        let replaceValue = '>>>>>>> fffffff ($<from>...$<to>)';
+        let replaceValue = '>>>>>>> fffffff ($1)';
 
         // normalize a format found on AppVeyor
-        textOrDir = textOrDir.replace(/^>>>>>>> [0-9a-f]{7}\.{3} (?<from>\S+)\.{3}(?<to>\S+)$/m, replaceValue);
+        textOrDir = textOrDir.replace(/^>>>>>>> [0-9a-f]{7}\.{3} (\S+)$/m, replaceValue);
 
-        tree[path] = textOrDir.replace(/^>>>>>>> [0-9a-f]{7} \((?<from>\S+)\.{3}(?<to>\S+)\)$/m, replaceValue);
+        tree[path] = textOrDir.replace(/^>>>>>>> [0-9a-f]{7} \((\S+)\)$/m, replaceValue);
       } else {
         replaceConflictRevisions(textOrDir);
       }