tree 0d041dbfaeb18b75b996e9c302489a8aea1ed6f2
parent 34444ba2c7f8f899f3198240673418665f811a1c
parent 635fa7dd9d885a0745ee72a7e5ce4fb6694766de
author Anthony Sottile <asottile@umich.edu> 1426971877 -0700
committer Anthony Sottile <asottile@umich.edu> 1426971877 -0700

Merge pull request #49 from pre-commit/only_check_merge_conflicted_files

Only check merge conflicts on conflict commits