![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 6 Dec 2006 18:47:37 +0000 (10:47 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 6 Dec 2006 18:47:37 +0000 (10:47 -0800) |
* maint:
git-reset to remove "$GIT_DIR/MERGE_MSG"
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
git-reset to remove "$GIT_DIR/MERGE_MSG"
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
Trivial merge