summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e6ff0f4)
raw | patch | inline | side by side (parent: e6ff0f4)
author | Josh Triplett <josh@freedesktop.org> | |
Wed, 6 Jun 2007 04:24:19 +0000 (21:24 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 6 Jun 2007 07:40:50 +0000 (00:40 -0700) |
Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool.sh | patch | blob | history |
diff --git a/git-mergetool.sh b/git-mergetool.sh
index e62351bcbabc00a3d89ddf1c8dd936cea400501f..bb21b037d65f5a63ba461647b449c9390cb1488f 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
# 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] ...'