summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d1d6287)
raw | patch | inline | side by side (parent: d1d6287)
author | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Sat, 15 Dec 2018 20:02:47 +0000 (23:02 +0300) | ||
committer | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Sat, 15 Dec 2018 20:02:47 +0000 (23:02 +0300) |
Dev/Mod/Diff.odc | patch | blob | history | |
README | patch | blob | history |
diff --git a/Dev/Mod/Diff.odc b/Dev/Mod/Diff.odc
index aa95243369b5ff180723d90359cdde7ab261c78f..507ce85a831cb537409d3537d116547488314750 100644 (file)
Binary files a/Dev/Mod/Diff.odc and b/Dev/Mod/Diff.odc differ
Binary files a/Dev/Mod/Diff.odc and b/Dev/Mod/Diff.odc differ
index 3adf02a4a58fd64ff0b104156e6a224c5b25f633..e1a4e4f1f68f1a4c1f688f9f02f4fe6eb553335b 100644 (file)
--- a/README
+++ b/README
--------------------
See sources. Documentation not writed yet.
+Coomand DevDiff.Compare compare texts from two windows (link DevSearchCompare).
Command DevDiff.CompareThis compare two files and produce patch in unified diff format.
Command DevDiff.PatchThis read patch in unified diff format and apply changes from it.
Command DevDiff.MergeThis read three files and do thee-way merge.