summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-06 12:25:15 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-06 12:25:15 +0900
commit847650798bbd6bd632b2b067fa0771fe41a03b31 (patch)
treea6640efe0b0f7403b0597accedfe4f3532cae7ad /ll-merge.c
parentMerge branch 'jc/git-gui-has-maintainer' (diff)
parent.mailmap: update email address of Andrey Mazo (diff)
downloadtgif-847650798bbd6bd632b2b067fa0771fe41a03b31.tar.xz
Merge branch 'am/mailmap-andrey-mazo'
* am/mailmap-andrey-mazo: .mailmap: update email address of Andrey Mazo
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions