From: David Aguilar Date: Thu, 06 Oct 2016 23:47:56 GMT Subject: [PATCH 1/4] mergetool: add copyright Message-ID: <1475797679-32712-1-git-send-email-davvid@gmail.com> Signed-off-by: David Aguilar --- git-mergetool.sh | 1 + 1 file changed, 1 insertion(+) 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. -- 2.10.1.355.g33afd83.dirty