tree 0d041dbfaeb18b75b996e9c302489a8aea1ed6f2
parent 34444ba2c7f8f899f3198240673418665f811a1c
author Anthony Sottile <asottile@umich.edu> 1426893309 -0700
committer Anthony Sottile <asottile@umich.edu> 1426893662 -0700

Only check merge conflicts on conflict commits