diff --git a/README.md b/README.md index 2a9e02d479..307b678e28 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,8 @@ In this JavaScript example, we can see: whitespace. (2) Difftastic understands which lines should be aligned. It's aligned -`bar()` on the left with `bar(1)` on the right, despite their changes. +`bar(1)` on the left with `bar(2)` on the right, even though the +textual content isn't identical. (3) Difftastic understands that line-wrapping isn't meaningful. `"eric"` is now on a new line, but it hasn't changed. diff --git a/img/js.png b/img/js.png index a668ea970c..9dabb388bf 100644 Binary files a/img/js.png and b/img/js.png differ diff --git a/sample_files/compare.expected b/sample_files/compare.expected index 720d8e62b1..6ec0b65ed3 100644 --- a/sample_files/compare.expected +++ b/sample_files/compare.expected @@ -89,7 +89,7 @@ sample_files/javascript_before.js sample_files/javascript_after.js 51ffab103bd475c322b7aa42f35c094e - sample_files/javascript_simple_before.js sample_files/javascript_simple_after.js -53725de32eabe5ff5a9230bd30cae28a - +3357d9d47a5e7efb3c7677745993ea2b - sample_files/json_before.json sample_files/json_after.json bae479fb04e15baf9460c5274c77963b - diff --git a/sample_files/javascript_simple_after.js b/sample_files/javascript_simple_after.js index 2a957237fd..1d6c06b957 100644 --- a/sample_files/javascript_simple_after.js +++ b/sample_files/javascript_simple_after.js @@ -1,9 +1,11 @@ // hello if (true) { foo(); - bar(1); + bar(2); baz(); } -var people = ["john", "harry", "dick", "yvonne", - "archibald", "jenny", "alexandra"]; +var people = [ + "john", "harry", "dick", "yvonne", + "eric", "jenny", "alexandra", +]; diff --git a/sample_files/javascript_simple_before.js b/sample_files/javascript_simple_before.js index 1e4178ce44..b0e0ee369c 100644 --- a/sample_files/javascript_simple_before.js +++ b/sample_files/javascript_simple_before.js @@ -1,7 +1,9 @@ // hello foo(); -bar(); +bar(1); baz(); -var people = ["john", "harry", "dick", "archibald", - "jenny", "alexandra"]; +var people = [ + "john", "harry", "dick", "eric", + "jenny", "alexandra", +];