From 6b5b2a1fc18d5ed5fa4ca589e7fbe22550cc8917 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 12 Apr 2017 08:28:31 +0200 Subject: [PATCH 1/4] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index b5519b1..61397d5 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ # java-diff-utils ## Status ## -[![Build Status](https://travis-ci.org/wumpz/java-diff-utils.svg?branch=master)](https://travis-ci.org/wumpz/java-diff-utils) - -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=wumpz/java-diff-utils&utm_campaign=Badge_Grade) +[![Build Status](https://travis-ci.org/wumpz/java-diff-utils.svg?branch=master)](https://travis-ci.org/wumpz/java-diff-utils) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=wumpz/java-diff-utils&utm_campaign=Badge_Grade) ## Intro ## Diff Utils library is an OpenSource library for performing the comparison operations between texts: computing diffs, applying patches, generating unified diffs or parsing them, generating diff output for easy future displaying (like side-by-side view) and so on. From 85b38bb64e9be2b70806215b7bf5ad05f673d335 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 12 Apr 2017 08:33:35 +0200 Subject: [PATCH 2/4] Update README.md --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 61397d5..f2e470c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,22 @@ Main reason to build this library was the lack of easy-to-use libraries with all Look [here](https://github.com/wumpz/java-diff-utils/wiki) to find more helpful informations and examples. +These two outputs are generated using this java-diff-utils. The source code can also be found at the *Examples* page: + +Producing a one liner including all difference information. +``` +This is a test ~senctence~**for diffutils**. +``` + +Producing a side by side view of computed differences. +``` +|original|new| +|--------|---| +|This is a test ~senctence~.|This is a test **for diffutils**.| +|This is the second line.|This is the second line.| +|~And here is the finish.~|| +``` + ## Main Features ## * computing the difference between two texts. From c156bd139af38bc36314c8d107ccbb8bb1dd1330 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 12 Apr 2017 08:34:15 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f2e470c..e71f220 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,18 @@ Look [here](https://github.com/wumpz/java-diff-utils/wiki) to find more helpful These two outputs are generated using this java-diff-utils. The source code can also be found at the *Examples* page: Producing a one liner including all difference information. -``` + This is a test ~senctence~**for diffutils**. -``` + Producing a side by side view of computed differences. -``` + |original|new| |--------|---| |This is a test ~senctence~.|This is a test **for diffutils**.| |This is the second line.|This is the second line.| |~And here is the finish.~|| -``` + ## Main Features ## From 052ac7c7e589ba272737ed28c200a575c39a6779 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 12 Apr 2017 08:41:32 +0200 Subject: [PATCH 4/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e71f220..dcea975 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,12 @@ Look [here](https://github.com/wumpz/java-diff-utils/wiki) to find more helpful These two outputs are generated using this java-diff-utils. The source code can also be found at the *Examples* page: -Producing a one liner including all difference information. +**Producing a one liner including all difference information.** This is a test ~senctence~**for diffutils**. -Producing a side by side view of computed differences. +**Producing a side by side view of computed differences.** |original|new| |--------|---|