Allow git.checkout() to work on unmerged indexes