tree c1d91ed6ddd7fe75f4c8f515f742673abaa1eaf1
parent 70a319aea3108d352ad8e194b6877be8dc355d65
parent 86d844680015d60043a404f0b021463027b89e43
author Anthony Sottile <asottile@umich.edu> 1426290647 -0600
committer Anthony Sottile <asottile@umich.edu> 1426290647 -0600

Merge pull request #47 from guykisel/merge-conflict-hook

Add check-merge-conflict hook