Andrew's git / gitweb.git / diff
?
mergetool: add copyright
authorDavid Aguilar <davvid@gmail.com>
Fri, 7 Oct 2016 23:58:03 +0000 (16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 17:04:10 +0000 (10:04 -0700)
Signed-off-by: David Aguilar <davvid@gmail.com>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
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 bf862705d8c654a5dd58ec70d6781583b7dbefc3..300ce7f67553497242f2e6f03482e3fc2060c3d7 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -3,6 +3,7 @@
 # This program resolves merge conflicts in git
 #
 # Copyright (c) 2006 Theodore Y. Ts'o
+# Copyright (c) 2009-2016 David Aguilar
 #
 # This file is licensed under the GPL v2, or a later version
 # at the discretion of Junio C Hamano.