Skip to content

Commit

Permalink
Update screenshot and ensure sample files match
Browse files Browse the repository at this point in the history
  • Loading branch information
Wilfred committed Jan 23, 2023
1 parent edb51ec commit 9ce6014
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Binary file modified img/js.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion sample_files/compare.expected
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down
8 changes: 5 additions & 3 deletions sample_files/javascript_simple_after.js
Original file line number Diff line number Diff line change
@@ -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",
];
8 changes: 5 additions & 3 deletions sample_files/javascript_simple_before.js
Original file line number Diff line number Diff line change
@@ -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",
];

0 comments on commit 9ce6014

Please sign in to comment.