Code

builtin-merge: fix a typo in an error message
authorAllan Caffee <allan.caffee@gmail.com>
Mon, 13 Apr 2009 18:10:08 +0000 (14:10 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Apr 2009 16:36:14 +0000 (09:36 -0700)
commit345f6e2cb547007da48ef503f00070cdcca04975
treea471b7a6835d742856127625ac84f20e0da42411
parentc2318228ab327999520b2e5dbc9edbd619a73105
builtin-merge: fix a typo in an error message

Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge.c