提交 8827b3a8 编写于 作者: D David Aguilar 提交者: Junio C Hamano

mergetool: add copyright

Signed-off-by: NDavid Aguilar <davvid@gmail.com>
Reviewed-by: NJohannes Sixt <j6t@kdbg.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 a23ca1b8
......@@ -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.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册