summaryrefslogtreecommitdiffstats
path: root/python/python3-three-merge/README
diff options
context:
space:
mode:
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.