Fix typo in git-mergetool

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Josh Triplett 2007-06-05 21:24:19 -07:00 committed by Junio C Hamano
parent e6ff0f42bb
commit 2571ac6722

View File

@ -5,7 +5,7 @@
# Copyright (c) 2006 Theodore Y. Ts'o
#
# This file is licensed under the GPL v2, or a later version
# at the discretion of Junio C Hammano.
# at the discretion of Junio C Hamano.
#
USAGE='[--tool=tool] [file to merge] ...'