summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-12 08:05:28 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-12 08:05:28 +0900
commitfe0a9eaf31dd0c349ae4308498c33a5c3794b293 (patch)
treed58beeacadce08282804ab8c99d258d5fa0033c7 /ll-merge.c
parentRevert "Merge branch 'en/rename-directory-detection'" (diff)
parentgit-svn: allow empty email-address using authors-prog and authors-file (diff)
downloadtgif-fe0a9eaf31dd0c349ae4308498c33a5c3794b293.tar.xz
Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn
* 'svn/authors-prog-2' of git://bogomips.org/git-svn: git-svn: allow empty email-address using authors-prog and authors-file git-svn: search --authors-prog in PATH too
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions