On Wed, 25 Feb 2009, Junio C Hamano wrote: > > "git merge" has always had this "stash away local changes before starting, > and unstash once done" safety when we try to run multiple strategies. > A patch to trigger it even for a single strategy case may be trivial. Well, I'd feel better if it was actually in the low-level merge code, the way the current "I refuse to merge if the file is dirty" logic is. Linus -- 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
