diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:17 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:17 -0800 |
commit | 1bb4abeff7e541ccfd7c87f5369b090829346e68 (patch) | |
tree | 7e9dae7f6a5aba1d5241851bd46c6f7f458ebaf6 /t/t4034/fortran | |
parent | fc180d98a20b6270ec25ca19c8d18a0a1286fe15 (diff) | |
parent | 5269edf1702b7375a287d5bbbb3c1b1f3a8aa765 (diff) | |
download | git-1bb4abeff7e541ccfd7c87f5369b090829346e68.tar.gz git-1bb4abeff7e541ccfd7c87f5369b090829346e68.tar.xz |
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/fortran')
-rw-r--r-- | t/t4034/fortran/expect | 10 | ||||
-rw-r--r-- | t/t4034/fortran/post | 5 | ||||
-rw-r--r-- | t/t4034/fortran/pre | 5 |
3 files changed, 20 insertions, 0 deletions
diff --git a/t/t4034/fortran/expect b/t/t4034/fortran/expect new file mode 100644 index 000000000..b233dbd62 --- /dev/null +++ b/t/t4034/fortran/expect @@ -0,0 +1,10 @@ +<BOLD>diff --git a/pre b/post<RESET> +<BOLD>index 87f0d0b..d308da2 100644<RESET> +<BOLD>--- a/pre<RESET> +<BOLD>+++ b/post<RESET> +<CYAN>@@ -1,5 +1,5 @@<RESET> +print *, "Hello World<RED>!<RESET><GREEN>?<RESET>" + +DO10I = 1,10<RESET> +<RED>DO10I<RESET><GREEN>DO 10 I<RESET> = 1,10 +<RED>DO10I<RESET><GREEN>DO 1 0 I<RESET> = 1,10 diff --git a/t/t4034/fortran/post b/t/t4034/fortran/post new file mode 100644 index 000000000..d308da2ad --- /dev/null +++ b/t/t4034/fortran/post @@ -0,0 +1,5 @@ +print *, "Hello World?" + +DO10I = 1,10 +DO 10 I = 1,10 +DO 1 0 I = 1,10 diff --git a/t/t4034/fortran/pre b/t/t4034/fortran/pre new file mode 100644 index 000000000..87f0d0b03 --- /dev/null +++ b/t/t4034/fortran/pre @@ -0,0 +1,5 @@ +print *, "Hello World!" + +DO10I = 1,10 +DO10I = 1,10 +DO10I = 1,10 |