@biffo/cli 0.298.5 → 0.298.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +3 -0
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -813,6 +813,9 @@ async function classify(path, base, ours, theirs, opts, mergeFile, isDeclaredDiv
|
|
|
813
813
|
const inOurs = ours.has(path);
|
|
814
814
|
const inTheirs = theirs.has(path);
|
|
815
815
|
if (!inBase && !inTheirs) {
|
|
816
|
+
if (isDeclaredDivergent(path)) {
|
|
817
|
+
return { path, status: "keep-ours", conflicted: false, orphaned: false };
|
|
818
|
+
}
|
|
816
819
|
return { path, status: "keep-ours", conflicted: false, orphaned: true };
|
|
817
820
|
}
|
|
818
821
|
if (!inBase && inTheirs) {
|