Paul Tan <pyokagan@xxxxxxxxx> writes: > Commit d38a30df (Be more user-friendly when refusing to do something > because of conflict) introduced code paths to git-pull which will error > out with user-friendly advices if the user is in the middle of a merge > or has unmerged files. When referencing a commit like this, you may want to add the author of the commit in Cc: to make sure he reads. I did read, so it's OK. And sorry for not testing my code enough ;-). The patch looks good to me. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html