pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-18 01:20:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use asottile/add-trailing-comma

Browse source
This commit is contained in:
Anthony Sottile 2017-07-12 18:35:24 -07:00
parent 286962eeb7
commit 2a902e0a07
19 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/check_merge_conflict_test.py
View file

@ -45,7 +45,7 @@ def f1_is_a_conflict_file(tmpdir):
'child\n'
'=======\n'
'parent\n'
'>>>>>>>'
'>>>>>>>',
) or f1.startswith(
'<<<<<<< HEAD\n'
'child\n'
@ -53,7 +53,7 @@ def f1_is_a_conflict_file(tmpdir):
'||||||| merged common ancestors\n'
'=======\n'
'parent\n'
'>>>>>>>'
'>>>>>>>',
) or f1.startswith(
# .gitconfig with [pull] rebase = preserve causes a rebase which
# flips parent / child
@ -61,7 +61,7 @@ def f1_is_a_conflict_file(tmpdir):
'parent\n'
'=======\n'
'child\n'
'>>>>>>>'
'>>>>>>>',
)
assert os.path.exists(os.path.join('.git', 'MERGE_MSG'))
yield