tree b814db98ff77d43fb47c55cbdbe09d7be0d32036
parent 45405a74fc7f6684ae83be4c16b76b84986c6113
author Edward Thomson <ethomson@github.com> 1466030257 -0500
committer Edward Thomson <ethomson@github.com> 1466892344 -0400

checkout: dirty index should conflict on typechange

When the target of a checkout has a typechange of an item, a modified
index entry should cause a conflict even when the workdir has been
reverted to the baseline.