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>
David Aguilar committed
Oct 7, 2016 at 16:58 UTC
8827b3a8873ebfad79b324d6134c1ec4bbea5f06
1 file changed
+1
git-mergetool.sh
+1
@@ -3,6 +3,7 @@
3
# This program resolves merge conflicts in git
4
#
5
# Copyright (c) 2006 Theodore Y. Ts'o
6
+# Copyright (c) 2009-2016 David Aguilar
7
#
8
# This file is licensed under the GPL v2, or a later version
9
# at the discretion of Junio C Hamano.