summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-10 22:16:47 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-10 22:16:47 -0700
commit9c5164032f4c25090e6139a202825febb830feea (patch)
tree72d8cf819b6afe936f8dfb5e7513b10f7bb6d97e /merge-recursive.c
parent38a9f35d1f7d2d90dafbbf4c45ac9500260eaeb0 (diff)
parent5ed5bbc7e1c3a0144db42d6ec4689e01b2f37516 (diff)
downloadgit-9c5164032f4c25090e6139a202825febb830feea.tar.gz
Merge branch 'zf/maint-gitweb-acname'
* zf/maint-gitweb-acname: gitweb: parse_commit_text encoding fix
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions