Merge branch 'maint'
* maint: git-reset to remove "$GIT_DIR/MERGE_MSG" unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
Junio C Hamano committed
Dec 6, 2006 at 10:47 UTC
2d13b732e3b2aca685615f353e3353e26cdbd9b3
No changes.