diff options
Diffstat (limited to 'tests-clar/resources/attr')
| -rw-r--r-- | tests-clar/resources/attr/.gitted/index | bin | 1856 -> 1856 bytes | |||
| -rw-r--r-- | tests-clar/resources/attr/.gitted/logs/HEAD | 1 | ||||
| -rw-r--r-- | tests-clar/resources/attr/.gitted/logs/refs/heads/master | 1 | ||||
| -rw-r--r-- | tests-clar/resources/attr/.gitted/objects/16/983da6643656bb44c43965ecb6855c6d574512 | bin | 0 -> 446 bytes | |||
| -rw-r--r-- | tests-clar/resources/attr/.gitted/objects/8d/0b9df9bd30be7910ddda60548d485bc302b911 | 1 | ||||
| -rw-r--r-- | tests-clar/resources/attr/.gitted/objects/a0/f7217ae99f5ac3e88534f5cea267febc5fa85b | 1 | ||||
| -rw-r--r-- | tests-clar/resources/attr/.gitted/objects/b4/35cd5689a0fb54afbeda4ac20368aa480e8f04 | bin | 0 -> 40 bytes | |||
| -rw-r--r-- | tests-clar/resources/attr/.gitted/refs/heads/master | 2 | ||||
| -rw-r--r-- | tests-clar/resources/attr/gitignore | 1 | ||||
| -rw-r--r-- | tests-clar/resources/attr/root_test4.txt | 4 | ||||
| -rw-r--r-- | tests-clar/resources/attr/sub/ign | 1 | ||||
| -rw-r--r-- | tests-clar/resources/attr/sub/ign/file | 1 | ||||
| -rw-r--r-- | tests-clar/resources/attr/sub/ign/sub/file | 1 |
13 files changed, 9 insertions, 5 deletions
diff --git a/tests-clar/resources/attr/.gitted/index b/tests-clar/resources/attr/.gitted/index Binary files differindex 1d60eab8f..439ffb151 100644 --- a/tests-clar/resources/attr/.gitted/index +++ b/tests-clar/resources/attr/.gitted/index diff --git a/tests-clar/resources/attr/.gitted/logs/HEAD b/tests-clar/resources/attr/.gitted/logs/HEAD index 73f00f345..8ece39f37 100644 --- a/tests-clar/resources/attr/.gitted/logs/HEAD +++ b/tests-clar/resources/attr/.gitted/logs/HEAD @@ -6,3 +6,4 @@ a5d76cad53f66f1312bd995909a5bab3c0820770 370fe9ec224ce33e71f9e5ec2bd1142ce9937a6 f5b0af1fb4f5c0cd7aad880711d368a07333c307 a97cc019851d401a4f1d091cb91a15890a0dd1ba Russell Belfer <arrbee@arrbee.com> 1328653313 -0800 commit: Some whitespace only changes for testing purposes a97cc019851d401a4f1d091cb91a15890a0dd1ba 217878ab49e1314388ea2e32dc6fdb58a1b969e0 Russell Belfer <arrbee@arrbee.com> 1332734901 -0700 commit: added files in sub/sub 217878ab49e1314388ea2e32dc6fdb58a1b969e0 24fa9a9fc4e202313e24b648087495441dab432b Russell Belfer <arrbee@arrbee.com> 1332735555 -0700 commit: adding more files in sub for tree status +24fa9a9fc4e202313e24b648087495441dab432b 8d0b9df9bd30be7910ddda60548d485bc302b911 yorah <yoram.harmelin@gmail.com> 1341230701 +0200 commit: Updating test data so we can test inter-hunk-context diff --git a/tests-clar/resources/attr/.gitted/logs/refs/heads/master b/tests-clar/resources/attr/.gitted/logs/refs/heads/master index 73f00f345..8ece39f37 100644 --- a/tests-clar/resources/attr/.gitted/logs/refs/heads/master +++ b/tests-clar/resources/attr/.gitted/logs/refs/heads/master @@ -6,3 +6,4 @@ a5d76cad53f66f1312bd995909a5bab3c0820770 370fe9ec224ce33e71f9e5ec2bd1142ce9937a6 f5b0af1fb4f5c0cd7aad880711d368a07333c307 a97cc019851d401a4f1d091cb91a15890a0dd1ba Russell Belfer <arrbee@arrbee.com> 1328653313 -0800 commit: Some whitespace only changes for testing purposes a97cc019851d401a4f1d091cb91a15890a0dd1ba 217878ab49e1314388ea2e32dc6fdb58a1b969e0 Russell Belfer <arrbee@arrbee.com> 1332734901 -0700 commit: added files in sub/sub 217878ab49e1314388ea2e32dc6fdb58a1b969e0 24fa9a9fc4e202313e24b648087495441dab432b Russell Belfer <arrbee@arrbee.com> 1332735555 -0700 commit: adding more files in sub for tree status +24fa9a9fc4e202313e24b648087495441dab432b 8d0b9df9bd30be7910ddda60548d485bc302b911 yorah <yoram.harmelin@gmail.com> 1341230701 +0200 commit: Updating test data so we can test inter-hunk-context diff --git a/tests-clar/resources/attr/.gitted/objects/16/983da6643656bb44c43965ecb6855c6d574512 b/tests-clar/resources/attr/.gitted/objects/16/983da6643656bb44c43965ecb6855c6d574512 Binary files differnew file mode 100644 index 000000000..e49c94acd --- /dev/null +++ b/tests-clar/resources/attr/.gitted/objects/16/983da6643656bb44c43965ecb6855c6d574512 diff --git a/tests-clar/resources/attr/.gitted/objects/8d/0b9df9bd30be7910ddda60548d485bc302b911 b/tests-clar/resources/attr/.gitted/objects/8d/0b9df9bd30be7910ddda60548d485bc302b911 new file mode 100644 index 000000000..3dcf088e4 --- /dev/null +++ b/tests-clar/resources/attr/.gitted/objects/8d/0b9df9bd30be7910ddda60548d485bc302b911 @@ -0,0 +1 @@ +xKj1D)zoli _"hi K2LG!7Ȫ J,EPXDS ] /)}/UwR . jp##:?:|;F9܋r=_ )ơN/A[l!q}<Lfx4H\\q֏cjT
\ No newline at end of file diff --git a/tests-clar/resources/attr/.gitted/objects/a0/f7217ae99f5ac3e88534f5cea267febc5fa85b b/tests-clar/resources/attr/.gitted/objects/a0/f7217ae99f5ac3e88534f5cea267febc5fa85b new file mode 100644 index 000000000..985c2e281 --- /dev/null +++ b/tests-clar/resources/attr/.gitted/objects/a0/f7217ae99f5ac3e88534f5cea267febc5fa85b @@ -0,0 +1 @@ +x510 E}?;S␈Ԯۓv 8O'F:2r)(
&9ZAѹr9l
%3Eo.Vi<B FMb+*vmLKݭD?+N
\ No newline at end of file diff --git a/tests-clar/resources/attr/.gitted/objects/b4/35cd5689a0fb54afbeda4ac20368aa480e8f04 b/tests-clar/resources/attr/.gitted/objects/b4/35cd5689a0fb54afbeda4ac20368aa480e8f04 Binary files differnew file mode 100644 index 000000000..ffe3473f4 --- /dev/null +++ b/tests-clar/resources/attr/.gitted/objects/b4/35cd5689a0fb54afbeda4ac20368aa480e8f04 diff --git a/tests-clar/resources/attr/.gitted/refs/heads/master b/tests-clar/resources/attr/.gitted/refs/heads/master index 8768776b3..b3abfff7d 100644 --- a/tests-clar/resources/attr/.gitted/refs/heads/master +++ b/tests-clar/resources/attr/.gitted/refs/heads/master @@ -1 +1 @@ -24fa9a9fc4e202313e24b648087495441dab432b +8d0b9df9bd30be7910ddda60548d485bc302b911 diff --git a/tests-clar/resources/attr/gitignore b/tests-clar/resources/attr/gitignore index 546d48f3a..192967012 100644 --- a/tests-clar/resources/attr/gitignore +++ b/tests-clar/resources/attr/gitignore @@ -1,3 +1,2 @@ -sub ign dir/ diff --git a/tests-clar/resources/attr/root_test4.txt b/tests-clar/resources/attr/root_test4.txt index fe773770c..a0f7217ae 100644 --- a/tests-clar/resources/attr/root_test4.txt +++ b/tests-clar/resources/attr/root_test4.txt @@ -1,6 +1,6 @@ Here is some stuff at the start -This should go in one hunk +This should go in one hunk (first) Some additional lines @@ -8,7 +8,7 @@ Down here below the other lines With even more at the end -Followed by a second hunk of stuff +Followed by a second hunk of stuff (second) That happens down here diff --git a/tests-clar/resources/attr/sub/ign b/tests-clar/resources/attr/sub/ign deleted file mode 100644 index 592fd2594..000000000 --- a/tests-clar/resources/attr/sub/ign +++ /dev/null @@ -1 +0,0 @@ -ignore me diff --git a/tests-clar/resources/attr/sub/ign/file b/tests-clar/resources/attr/sub/ign/file new file mode 100644 index 000000000..4dcd992e1 --- /dev/null +++ b/tests-clar/resources/attr/sub/ign/file @@ -0,0 +1 @@ +in ignored dir diff --git a/tests-clar/resources/attr/sub/ign/sub/file b/tests-clar/resources/attr/sub/ign/sub/file new file mode 100644 index 000000000..88aca0164 --- /dev/null +++ b/tests-clar/resources/attr/sub/ign/sub/file @@ -0,0 +1 @@ +below ignored dir |