Make sure we error out if we can't remove a file on automatic merges.
[git] / gitenv.c
2005-05-11  Petr BaudisMerge ... http://members.cox.net/junkio/git-jc.git
2005-05-10  Junio C HamanoRename environment variables.