andras/reconcile
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Change style

Browse source
This commit is contained in:
Andras Schmelczer 2026-03-10 20:42:09 +00:00
parent 408ce5268f
commit deffa195b3
23 changed files with 72 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/compare-with-diff-match-patch.rs
View file

@ -47,7 +47,7 @@ fn try_merge(parent: &str, left: &str, right: &str) {
}
/// Demonstrates cases where diff-match-patch silently produces incorrect
/// output, while reconcile-text preserves both users' edits correctly.
/// output, while reconcile-text preserves both users' edits correctly
///
/// Run it with:
/// `cargo run --example compare-with-diff-match-patch`

12
examples/website/src/index.html
View file

@ -8,12 +8,12 @@
/>
<meta
name="description"
content="3-way text merging that automatically resolves conflicts. No more Git conflict markers — just clean, merged results."
content="3-way text merging that automatically resolves conflicts. No more Git conflict markers - just clean, merged results."
/>
<meta property="og:title" content="3-Way Text Merge" />
<meta
property="og:description"
content="3-way text merging that automatically resolves conflicts. No more Git conflict markers — just clean, merged results."
content="3-way text merging that automatically resolves conflicts. No more Git conflict markers - just clean, merged results."
/>
<meta property="og:type" content="website" />
<meta property="og:url" content="https://schmelczer.dev/reconcile" />
@ -85,7 +85,7 @@
>documentation</a
>
or try editing the text boxes below to see <code>reconcile-text</code> in
action. Use the tokenisation options to experiment with different approaches—
action. Use the tokenisation options to experiment with different approaches -
the Rust library also supports custom tokenisers.
</p>
</header>
@ -145,7 +145,7 @@
<div class="text-area-card diamond-left">
<label
for="left"
title="First user's edits — changes from this box appear in green in the result."
title="First user's edits - changes from this box appear in green in the result."
>
First user's edits
<div class="box Left"></div>
@ -156,7 +156,7 @@
<div class="text-area-card diamond-right">
<label
for="right"
title="Second user's edits — changes from this box appear in blue in the result."
title="Second user's edits - changes from this box appear in blue in the result."
>
Second user's edits
<div class="box Right"></div>
@ -167,7 +167,7 @@
<div class="text-area-card diamond-result">
<label
for="merged"
title="The automatically merged result — edit the boxes above to see changes in real-time."
title="The automatically merged result - edit the boxes above to see changes in real-time."
>
Merged result
<svg