tree b0c860305013dcc422c16d3cce6f581582c7816a
parent 78818b90cd694c29333ba54d38f9e60b6359ccfc
author Anthony Sottile <asottile@umich.edu> 1497289147 -0700
committer Anthony Sottile <asottile@umich.edu> 1497289147 -0700

Support rebase conflicts in check-merge-conflicts