@gitwand/core 2.3.0 → 2.4.1

package/dist/__tests__/patterns/non-overlapping.test.js

@@ -0,0 +1,240 @@
+/**
+ * Tests du pattern non_overlapping (priority 40)
+ *
+ * Nécessite diff3 (base obligatoire).
+ * Détection : l'algorithme mergeNonOverlapping() interne réussit —
+ * les zones modifiées par ours et theirs ne se chevauchent pas.
+ * Cas typique : ours ajoute des lignes en haut, theirs ajoute en bas.
+ * Auto-résolu en combinant les deux ensembles de changements.
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── Cas qui doivent matcher non_overlapping ─────────────────
+describe("non_overlapping : ours insère en haut, theirs insère en bas (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  INSERTED_BY_OURS,`,
+        `  alpha,`,
+        `  beta,`,
+        `||||||| base`,
+        `  alpha,`,
+        `  beta,`,
+        `=======`,
+        `  alpha,`,
+        `  beta,`,
+        `  INSERTED_BY_THEIRS,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/list.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout (autoResolved === 1)", () => {
+        const result = resolve(input, "src/list.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les insertions des deux côtés", () => {
+        const result = resolve(input, "src/list.ts");
+        const merged = result.mergedContent;
+        expect(merged).toContain("INSERTED_BY_OURS");
+        expect(merged).toContain("INSERTED_BY_THEIRS");
+        expect(merged).toContain("alpha");
+        expect(merged).toContain("beta");
+    });
+});
+describe("non_overlapping : ours modifie première ligne, theirs modifie dernière ligne (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  host: "prod.example.com",`,
+        `  port: 5432,`,
+        `  name: "mydb",`,
+        `||||||| base`,
+        `  host: "localhost",`,
+        `  port: 5432,`,
+        `  name: "mydb",`,
+        `=======`,
+        `  host: "localhost",`,
+        `  port: 5432,`,
+        `  name: "production_db",`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/db-config.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/db-config.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat combine les deux modifications", () => {
+        const result = resolve(input, "src/db-config.ts");
+        const merged = result.mergedContent;
+        expect(merged).toContain("prod.example.com");
+        expect(merged).toContain("production_db");
+    });
+});
+describe("non_overlapping : ours ajoute avant, theirs ajoute au milieu (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  alpha,`,
+        `  INSERTED_BY_OURS,`,
+        `  beta,`,
+        `  gamma,`,
+        `||||||| base`,
+        `  alpha,`,
+        `  beta,`,
+        `  gamma,`,
+        `=======`,
+        `  alpha,`,
+        `  beta,`,
+        `  INSERTED_BY_THEIRS,`,
+        `  gamma,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/items.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/items.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("non_overlapping : modifications sur lignes distinctes (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  firstName: "John",`,
+        `  age: 30,`,
+        `  city: "Paris",`,
+        `||||||| base`,
+        `  firstName: "John",`,
+        `  age: 25,`,
+        `  city: "Paris",`,
+        `=======`,
+        `  firstName: "Jane",`,
+        `  age: 25,`,
+        `  city: "Paris",`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/user.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/user.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("non_overlapping : ajout d'imports dans des branches (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `import { ComponentA } from "./a";`,
+        `import { NewFromOurs } from "./ours";`,
+        `import { ComponentB } from "./b";`,
+        `||||||| base`,
+        `import { ComponentA } from "./a";`,
+        `import { ComponentB } from "./b";`,
+        `=======`,
+        `import { ComponentA } from "./a";`,
+        `import { ComponentB } from "./b";`,
+        `import { NewFromTheirs } from "./theirs";`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/imports.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/imports.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les imports des deux branches", () => {
+        const result = resolve(input, "src/imports.ts");
+        const merged = result.mergedContent;
+        expect(merged).toContain("NewFromOurs");
+        expect(merged).toContain("NewFromTheirs");
+    });
+});
+// ─── Cas qui ne doivent PAS matcher non_overlapping ──────────
+describe("non_overlapping : cas qui ne doivent pas matcher", () => {
+    it("ne matche pas si les deux côtés modifient la même ligne", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  value: "ours",`,
+            `||||||| base`,
+            `  value: "base",`,
+            `=======`,
+            `  value: "theirs",`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // Les deux modifient la même ligne → pas non_overlapping
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("non_overlapping");
+    });
+    it("ne matche pas si les deux insèrent la même ligne (same_change prioritaire)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  foo,`,
+            `  SAME_INSERTION,`,
+            `||||||| base`,
+            `  foo,`,
+            `=======`,
+            `  foo,`,
+            `  SAME_INSERTION,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // same_change (prio 10) prend la main
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("ne matche pas sans base (diff2)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  alpha,`,
+            `  OURS,`,
+            `  beta,`,
+            `=======`,
+            `  alpha,`,
+            `  beta,`,
+            `  THEIRS,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // Sans base on ne peut pas appliquer non_overlapping
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("non_overlapping");
+    });
+    it("ne matche pas si les deux côtés modifient des zones adjacentes qui se chevauchent", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  a: 1,`,
+            `  b: 20,`,
+            `  c: 30,`,
+            `||||||| base`,
+            `  a: 1,`,
+            `  b: 2,`,
+            `  c: 3,`,
+            `=======`,
+            `  a: 1,`,
+            `  b: 200,`,
+            `  c: 300,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // Les deux modifient b et c → chevauchement
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("non_overlapping");
+    });
+    it("ne matche pas si ours === theirs (same_change prioritaire)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  x: 42,`,
+            `||||||| base`,
+            `  x: 1,`,
+            `=======`,
+            `  x: 42,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+});
+//# sourceMappingURL=non-overlapping.test.js.map

package/dist/__tests__/patterns/non-overlapping.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"non-overlapping.test.js","sourceRoot":"","sources":["../../../src/__tests__/patterns/non-overlapping.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/patterns/one-side-change.test.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Tests du pattern one_side_change (priority 30)
+ *
+ * Nécessite diff3 (base obligatoire).
+ * Détection : (ours === base ET theirs ≠ base) OU (ours ≠ base ET theirs === base).
+ * Un seul côté a modifié par rapport à la base — l'autre est resté identique.
+ * Auto-résolu en prenant le côté qui a changé.
+ */
+export {};
+//# sourceMappingURL=one-side-change.test.d.ts.map

package/dist/__tests__/patterns/one-side-change.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"one-side-change.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/patterns/one-side-change.test.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}

package/dist/__tests__/patterns/one-side-change.test.js

@@ -0,0 +1,191 @@
+/**
+ * Tests du pattern one_side_change (priority 30)
+ *
+ * Nécessite diff3 (base obligatoire).
+ * Détection : (ours === base ET theirs ≠ base) OU (ours ≠ base ET theirs === base).
+ * Un seul côté a modifié par rapport à la base — l'autre est resté identique.
+ * Auto-résolu en prenant le côté qui a changé.
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── Cas qui doivent matcher one_side_change ─────────────────
+describe("one_side_change : theirs modifie, ours inchangé (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  retries: 3,`,
+        `||||||| base`,
+        `  retries: 3,`,
+        `=======`,
+        `  retries: 5,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en one_side_change", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.hunks[0].type).toBe("one_side_change");
+    });
+    it("auto-résout (autoResolved === 1)", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat prend la valeur de theirs", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.mergedContent).toContain("retries: 5");
+    });
+});
+describe("one_side_change : ours modifie, theirs inchangé (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  maxConnections: 100,`,
+        `||||||| base`,
+        `  maxConnections: 10,`,
+        `=======`,
+        `  maxConnections: 10,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en one_side_change", () => {
+        const result = resolve(input, "src/db.ts");
+        expect(result.hunks[0].type).toBe("one_side_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/db.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat prend la valeur de ours", () => {
+        const result = resolve(input, "src/db.ts");
+        expect(result.mergedContent).toContain("maxConnections: 100");
+    });
+});
+describe("one_side_change : theirs modifie un bloc multi-lignes (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  function oldImpl() {`,
+        `    return 42;`,
+        `  }`,
+        `||||||| base`,
+        `  function oldImpl() {`,
+        `    return 42;`,
+        `  }`,
+        `=======`,
+        `  function newImpl() {`,
+        `    return 100;`,
+        `  }`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en one_side_change", () => {
+        const result = resolve(input, "src/utils.ts");
+        expect(result.hunks[0].type).toBe("one_side_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/utils.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("one_side_change : ours modifie une chaîne (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `const API_URL = "https://api.v2.example.com";`,
+        `||||||| base`,
+        `const API_URL = "https://api.example.com";`,
+        `=======`,
+        `const API_URL = "https://api.example.com";`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en one_side_change", () => {
+        const result = resolve(input, "src/constants.ts");
+        expect(result.hunks[0].type).toBe("one_side_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/constants.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("one_side_change : theirs supprime, ours inchangé — delete_no_change prioritaire (prio 20)", () => {
+    // delete_no_change est prioritaire sur one_side_change pour les suppressions
+    it("delete_no_change (prio 20) prend la main quand theirs supprime et ours === base", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  debug: true,`,
+            `||||||| base`,
+            `  debug: true,`,
+            `=======`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        // delete_no_change est prioritaire (prio 20 < 30)
+        expect(result.hunks[0].type).toBe("delete_no_change");
+    });
+});
+// ─── Cas qui ne doivent PAS matcher one_side_change ──────────
+describe("one_side_change : cas qui ne doivent pas matcher", () => {
+    it("ne matche pas si les deux côtés diffèrent de la base", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  level: "warn",`,
+            `||||||| base`,
+            `  level: "info",`,
+            `=======`,
+            `  level: "error",`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("one_side_change");
+    });
+    it("ne matche pas si ours === theirs (same_change prioritaire)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  timeout: 3000,`,
+            `||||||| base`,
+            `  timeout: 5000,`,
+            `=======`,
+            `  timeout: 3000,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // Les deux ont fait le même changement → same_change (prio 10)
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("ne matche pas sans base (diff2 uniquement)", () => {
+        // diff2 ne fournit pas de base → one_side_change ne peut pas s'appliquer
+        const input = [
+            `<<<<<<< ours`,
+            `  value: 1,`,
+            `=======`,
+            `  value: 1,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // same_change (prio 10) prend la main car ours === theirs
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("ne matche pas si les deux côtés ajoutent des lignes différentes (diff3)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  foo,`,
+            `  bar,`,
+            `  addedByOurs,`,
+            `||||||| base`,
+            `  foo,`,
+            `  bar,`,
+            `=======`,
+            `  foo,`,
+            `  bar,`,
+            `  addedByTheirs,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("one_side_change");
+    });
+    it("ne matche pas si ours supprime et theirs modifie (les deux diffèrent de la base)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `||||||| base`,
+            `  oldValue: 42,`,
+            `=======`,
+            `  newValue: 99,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("one_side_change");
+    });
+});
+//# sourceMappingURL=one-side-change.test.js.map

package/dist/__tests__/patterns/one-side-change.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"one-side-change.test.js","sourceRoot":"","sources":["../../../src/__tests__/patterns/one-side-change.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/patterns/same-change.test.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Tests du pattern same_change (priority 10)
+ *
+ * Détection : les deux côtés (ours et theirs) sont identiques.
+ * Compatible diff2 et diff3.
+ * Auto-résolu car les deux branches ont fait le même changement.
+ */
+export {};
+//# sourceMappingURL=same-change.test.d.ts.map

package/dist/__tests__/patterns/same-change.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"same-change.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/patterns/same-change.test.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}

package/dist/__tests__/patterns/same-change.test.js

@@ -0,0 +1,173 @@
+/**
+ * Tests du pattern same_change (priority 10)
+ *
+ * Détection : les deux côtés (ours et theirs) sont identiques.
+ * Compatible diff2 et diff3.
+ * Auto-résolu car les deux branches ont fait le même changement.
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── Cas qui doivent matcher same_change ─────────────────────
+describe("same_change : les deux côtés sont identiques (diff2)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `const version = "2.0.0";`,
+        `=======`,
+        `const version = "2.0.0";`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en same_change", () => {
+        const result = resolve(input, "src/version.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("auto-résout (autoResolved === 1)", () => {
+        const result = resolve(input, "src/version.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le contenu résolu contient la ligne commune", () => {
+        const result = resolve(input, "src/version.ts");
+        expect(result.mergedContent).toContain('const version = "2.0.0"');
+    });
+});
+describe("same_change : les deux côtés sont identiques (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  timeout: 3000,`,
+        `||||||| base`,
+        `  timeout: 5000,`,
+        `=======`,
+        `  timeout: 3000,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en same_change", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("same_change : multi-lignes identiques des deux côtés (diff2)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `function greet(name: string) {`,
+        `  return \`Hello, \${name}!\`;`,
+        `}`,
+        `=======`,
+        `function greet(name: string) {`,
+        `  return \`Hello, \${name}!\`;`,
+        `}`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en same_change", () => {
+        const result = resolve(input, "src/utils.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/utils.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("same_change : suppression identique des deux côtés (diff2)", () => {
+    // Les deux côtés ont supprimé toutes les lignes (résultat vide)
+    const input = [
+        `<<<<<<< ours`,
+        `=======`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en same_change (suppression totale des deux côtés)", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("same_change : commentaire identique ajouté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `// TODO: refactor this`,
+        `const x = 42;`,
+        `||||||| base`,
+        `const x = 42;`,
+        `=======`,
+        `// TODO: refactor this`,
+        `const x = 42;`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en same_change", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+// ─── Cas qui ne doivent PAS matcher same_change ───────────────
+describe("same_change : cas qui ne doivent pas matcher", () => {
+    it("ne matche pas si ours ≠ theirs (valeurs différentes)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `const x = 1;`,
+            `=======`,
+            `const x = 2;`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("same_change");
+    });
+    it("ne matche pas si ours a une ligne supplémentaire", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `const x = 1;`,
+            `const y = 2;`,
+            `=======`,
+            `const x = 1;`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("same_change");
+    });
+    it("ne matche pas si theirs a une ligne supplémentaire", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `foo`,
+            `=======`,
+            `foo`,
+            `bar`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("same_change");
+    });
+    it("ne matche pas si un seul côté modifie (one_side_change)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  retries: 3,`,
+            `||||||| base`,
+            `  retries: 3,`,
+            `=======`,
+            `  retries: 5,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("same_change");
+    });
+    it("ne matche pas si les lignes sont dans un ordre différent", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `alpha`,
+            `beta`,
+            `=======`,
+            `beta`,
+            `alpha`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("same_change");
+    });
+});
+//# sourceMappingURL=same-change.test.js.map

package/dist/__tests__/patterns/same-change.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"same-change.test.js","sourceRoot":"","sources":["../../../src/__tests__/patterns/same-change.test.ts"],"names":[],"mappings":"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"}