From: Junio C Hamano <junkio@cox.net>
Date: Wed, 6 Dec 2006 18:47:37 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.0-rc0~161
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d13b732e3b2aca685615f353e3353e26cdbd9b3;p=git.git

Merge branch 'maint'

* maint:
  git-reset to remove "$GIT_DIR/MERGE_MSG"
  unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
---

2d13b732e3b2aca685615f353e3353e26cdbd9b3