summaryrefslogtreecommitdiff
path: root/t/t4109
diff options
context:
space:
mode:
authorLibravatar Rafael Garcia-Suarez <rgarciasuarez@gmail.com>2008-09-29 18:04:41 +0200
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-09-29 09:13:20 -0700
commitcbce6c0be30cbaf8c39051f85006d679338a8ddc (patch)
tree9e8768427a54f37d0d0529c7d06cf6de92fa9489 /t/t4109
parentUse strchrnul() instead of strchr() plus manual workaround (diff)
downloadtgif-cbce6c0be30cbaf8c39051f85006d679338a8ddc.tar.xz
Clarify commit error message for unmerged files
Currently, trying to use git-commit with unmerged files in the index will show the message "Error building trees", which can be a bit obscure to the end user. This patch makes the error message clearer, and consistent with what git-write-tree reports in a similar situation. Signed-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't/t4109')
0 files changed, 0 insertions, 0 deletions