aboutsummaryrefslogtreecommitdiff
path: root/python/python3-three-merge/README
diff options
context:
space:
mode:
authorIsaac Yu <isaacyu1@isaacyu1.com>2023-02-22 22:53:17 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-02-25 09:18:04 +0700
commitbec18ea1f5127e501dc758df48c7537980109ca4 (patch)
treee75cd838a0db1ce75cb3349446b390c99a864e31 /python/python3-three-merge/README
parentbf905467acca32dbe87dd04bbeee3795d5121dca (diff)
python/python3-three-merge: Added (3-way merge between strings)
Signed-off-by: bedlam <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'python/python3-three-merge/README')
-rw-r--r--python/python3-three-merge/README4
1 files changed, 4 insertions, 0 deletions
diff --git a/python/python3-three-merge/README b/python/python3-three-merge/README
new file mode 100644
index 0000000000..f44987d7b5
--- /dev/null
+++ b/python/python3-three-merge/README
@@ -0,0 +1,4 @@
+three-merge is a simple Python library to perform a 3-way merge between
+strings, based on diff-match-patch. This library performs merges at a
+character level, as opposed to most VCS systems, which opt for a
+line-based approach.