mergetool: add copyright

Signed-off-by: David Aguilar <redacted>
Reviewed-by: Johannes Sixt <redacted>
Signed-off-by: Junio C Hamano <redacted>

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.