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

Bump versions to 0.12.1
All checks were successful
Check / build (push) Successful in 9m31s
Details
Publish / build (push) Successful in 9m53s
Details
Publish / publish-crate (push) Has been skipped
Details
Publish / publish-npm (push) Has been skipped
Details
Publish / publish-pypi (push) Successful in 6m53s
Details

Browse source
This commit is contained in:
Andras Schmelczer 2026-05-31 22:31:39 +01:00
parent fd3a374b0f
commit fcc856279c
9 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -428,7 +428,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
name = "reconcile-text"
version = "0.12.0"
version = "0.12.1"
dependencies = [
"console_error_panic_hook",
"diff-match-patch-rs",

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "reconcile-text"
description = "Intelligent 3-way text merging with automated conflict resolution"
version = "0.12.0"
version = "0.12.1"
rust-version = "1.94"
authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
edition = "2024"

2
examples/website/package-lock.json generated
View file

@ -28,7 +28,7 @@
},
"../../reconcile-js": {
"name": "reconcile-text",
"version": "0.12.0",
"version": "0.12.1",
"dev": true,
"license": "MIT",
"devDependencies": {

6
reconcile-js/package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "reconcile-text",
"version": "0.12.0",
"version": "0.12.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "reconcile-text",
"version": "0.12.0",
"version": "0.12.1",
"license": "MIT",
"devDependencies": {
"@types/jest": "^30.0.0",
@ -25,7 +25,7 @@
},
"../pkg": {
"name": "reconcile-text",
"version": "0.12.0",
"version": "0.12.1",
"dev": true,
"license": "MIT"
},

2
reconcile-js/package.json
View file

@ -1,6 +1,6 @@
{
"name": "reconcile-text",
"version": "0.12.0",
"version": "0.12.1",
"description": "Intelligent 3-way text merging with automated conflict resolution",
"main": "dist/reconcile.node.js",
"browser": "dist/reconcile.web.js",

4
reconcile-python/Cargo.lock generated
View file

@ -130,14 +130,14 @@ dependencies = [
[[package]]
name = "reconcile-text"
version = "0.12.0"
version = "0.12.1"
dependencies = [
"thiserror",
]
[[package]]
name = "reconcile-text-python"
version = "0.12.0"
version = "0.12.1"
dependencies = [
"pyo3",
"reconcile-text",

2
reconcile-python/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "reconcile-text-python"
version = "0.12.0"
version = "0.12.1"
edition = "2024"
rust-version = "1.94"
authors = ["Andras Schmelczer <andras@schmelczer.dev>"]

2
reconcile-python/pyproject.toml
View file

@ -4,7 +4,7 @@ build-backend = "maturin"
[project]
name = "reconcile-text"
version = "0.12.0"
version = "0.12.1"
description = "Intelligent 3-way text merging with automated conflict resolution"
readme = "README.md"
license = { text = "MIT" }

2
reconcile-python/uv.lock generated
View file

@ -168,7 +168,7 @@ wheels = [
[[package]]
name = "reconcile-text"
version = "0.12.0"
version = "0.12.1"
source = { editable = "." }
[package.dev-dependencies]