mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-10-28 12:03:20 +00:00
Handle multiple conflict revisions deterministically
This commit is contained in:
1 parent
d784799969
commit
f8f11f358a
15 files changed
+576
-97
No files matched your search
@@ -28,6 +28,11 @@ describe("LiveSync-owned translation catalogue", () => {
|
||||
|
||||
it("uses LiveSync-owned provisional English without extending Commonlib's message contract", () => {
|
||||
expect($msg("This file has unresolved conflicts.")).toBe("This file has unresolved conflicts.");
|
||||
expect(
|
||||
$msg("This file has ${COUNT} unresolved versions. They will be reviewed one pair at a time.", {
|
||||
COUNT: "3",
|
||||
})
|
||||
).toBe("This file has 3 unresolved versions. They will be reviewed one pair at a time.");
|
||||
expect(translateLiveSyncMessage("This file has unresolved conflicts.")).toBe(
|
||||
"This file has unresolved conflicts."
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user