Skip to content

Conversation

bryangarza
Copy link
Contributor

>>>>>>> and <<<<<<< have text after, but ||||||| and =======
do not.

`>>>>>>>` and `<<<<<<<` have text after, but `|||||||` and `=======`
do not.
gracjan added a commit that referenced this pull request Mar 11, 2015
@gracjan gracjan merged commit f11ee56 into haskell:master Mar 11, 2015
@bryangarza bryangarza deleted the git-hunk-markers branch March 11, 2015 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants