diff options
| author | David Aguilar <davvid@gmail.com> | 2016-10-07 23:58:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-11 17:04:10 (GMT) |
| commit | 8827b3a8873ebfad79b324d6134c1ec4bbea5f06 (patch) | |
| tree | 31724d75861948e6c06b53c9f16189a503092518 /git-mergetool.sh | |
| parent | a23ca1b8dc42ffd4de2ef30d67ce1e21ded29886 (diff) | |
| download | git-8827b3a8873ebfad79b324d6134c1ec4bbea5f06.zip git-8827b3a8873ebfad79b324d6134c1ec4bbea5f06.tar.gz git-8827b3a8873ebfad79b324d6134c1ec4bbea5f06.tar.bz2 | |
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>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index bf86270..300ce7f 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. |