From: David Aguilar <davvid@gmail.com>
Date: Fri, 7 Oct 2016 23:58:03 +0000 (-0700)
Subject: mergetool: add copyright
X-Git-Tag: v2.11.0-rc0~56^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8827b3a8873ebfad79b324d6134c1ec4bbea5f06

mergetool: add copyright

Signed-off-by: David Aguilar <davvid@gmail.com>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-mergetool.sh b/git-mergetool.sh
index bf862705d8..300ce7f675 100755
--- 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.