Alexander Dupuy eefc46f901 Don't report markup titles as merge conflicts ... Several markup formats, such as Markdown or Re(Structured)Text can format titles as text with '=' characters as double underlining, like this: ``` My Page Title ============= Lorem ipsum... ``` Rather that considering any line starting with seven '=' as a conflict marker, require a space (or line-ending newline) after the equals. This could still create a false positive for a seven character title, like "Problem", but the markup formats generally allow extra '=' characters, so by formatting the text like this: ``` Problem ======== Not... ``` these pre-commit warnings can be avoided. Also updates the tests to add newlines for more realistic conflict files (while a file might not end with a newline, conflict markers will). Prevent false negative on test_does_not_care_when_not_in_a_conflict() by making sure that README.md contains a line identical to a conflict string (exactly seven '=' followed by a newline).		2015-05-09 04:20:38 +02:00
..
__init__.py	Initial commit.	2014-03-13 08:41:35 -07:00
autopep8_wrapper_test.py	Remove dependency on plumbum	2015-03-20 14:15:30 -07:00
check_added_large_files_test.py	Remove dependency on plumbum	2015-03-20 14:15:30 -07:00
check_case_conflict_test.py	Remove dependency on plumbum	2015-03-20 14:15:30 -07:00
check_docstring_first_test.py	implemented a basic double quote string fixer	2015-02-08 21:05:12 -08:00
check_json_test.py	Add a hook for checking parseable json.	2014-08-19 16:03:48 -07:00
check_merge_conflict_test.py	Don't report markup titles as merge conflicts	2015-05-09 04:20:38 +02:00
check_xml_test.py	Add check-xml hook.	2015-01-17 10:30:58 -08:00
check_yaml_test.py	Update project setup.	2014-04-13 22:09:26 -07:00
conftest.py	Remove dependency on plumbum	2015-03-20 14:15:30 -07:00
debug_statement_hook_test.py	Update pre-commit hooks	2015-01-04 16:05:54 -08:00
detect_private_key_test.py	Detect OpenSSH private keys	2015-03-07 09:35:30 -08:00
end_of_file_fixer_test.py	Update pre-commit hooks	2015-01-04 16:05:54 -08:00
readme_test.py	Add test for readme	2015-01-18 09:48:14 -08:00
requirements_txt_fixer_test.py	More naturally sort requirements.	2015-02-12 09:30:17 -08:00
string_fixer_test.py	Use the tokenizer for great success	2015-02-10 08:17:35 -08:00
tests_should_end_in_test_test.py	Add --django flag to test name checker	2015-03-11 17:44:59 -07:00
trailing_whitespace_fixer_test.py	Remove dependency on plumbum	2015-03-20 14:15:30 -07:00
util_test.py	Remove dependency on plumbum	2015-03-20 14:15:30 -07:00