diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-10 00:41:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 00:41:17 (GMT) |
| commit | 1bb4abeff7e541ccfd7c87f5369b090829346e68 (patch) | |
| tree | 7e9dae7f6a5aba1d5241851bd46c6f7f458ebaf6 /t/t4034/html | |
| parent | fc180d98a20b6270ec25ca19c8d18a0a1286fe15 (diff) | |
| parent | 5269edf1702b7375a287d5bbbb3c1b1f3a8aa765 (diff) | |
| download | git-1bb4abeff7e541ccfd7c87f5369b090829346e68.zip git-1bb4abeff7e541ccfd7c87f5369b090829346e68.tar.gz git-1bb4abeff7e541ccfd7c87f5369b090829346e68.tar.bz2 | |
Merge branch 'tr/diff-words-test'
* tr/diff-words-test:
t4034 (diff --word-diff): add a minimum Perl drier test vector
t4034 (diff --word-diff): style suggestions
userdiff: simplify word-diff safeguard
t4034: bulk verify builtin word regex sanity
Diffstat (limited to 't/t4034/html')
| -rw-r--r-- | t/t4034/html/expect | 8 | ||||
| -rw-r--r-- | t/t4034/html/post | 3 | ||||
| -rw-r--r-- | t/t4034/html/pre | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/t/t4034/html/expect b/t/t4034/html/expect new file mode 100644 index 0000000..447b49a --- /dev/null +++ b/t/t4034/html/expect @@ -0,0 +1,8 @@ +<BOLD>diff --git a/pre b/post<RESET> +<BOLD>index 8ca4aea..46921e5 100644<RESET> +<BOLD>--- a/pre<RESET> +<BOLD>+++ b/post<RESET> +<CYAN>@@ -1,3 +1,3 @@<RESET> +<tag <GREEN>newattr="newvalue"<RESET>><GREEN>added<RESET> content</tag> +<tag attr=<RED>"value"<RESET><GREEN>"newvalue"<RESET>><RED>content<RESET><GREEN>changed<RESET></tag> +<<RED>tag<RESET><GREEN>newtag<RESET>>content <RED>&entity;<RESET><GREEN>&newentity;<RESET><<RED>/tag<RESET><GREEN>/newtag<RESET>> diff --git a/t/t4034/html/post b/t/t4034/html/post new file mode 100644 index 0000000..46921e5 --- /dev/null +++ b/t/t4034/html/post @@ -0,0 +1,3 @@ +<tag newattr="newvalue">added content</tag> +<tag attr="newvalue">changed</tag> +<newtag>content &newentity;</newtag> diff --git a/t/t4034/html/pre b/t/t4034/html/pre new file mode 100644 index 0000000..8ca4aea --- /dev/null +++ b/t/t4034/html/pre @@ -0,0 +1,3 @@ +<tag>content</tag> +<tag attr="value">content</tag> +<tag>content &entity;</tag> |