summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-12-27 14:58:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-27 14:58:35 -0800
commit53f3478d42d00a34bfb031f41a4a9a3a225d312f (patch)
tree60b2488df3585068312dd83e94cf63f23d412233 /notes-merge.c
parentMerge branch 'fc/remote-helper-fixes' (diff)
parentgit-svn: workaround for a bug in svn serf backend (diff)
downloadtgif-53f3478d42d00a34bfb031f41a4a9a3a225d312f.tar.xz
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: git-svn: workaround for a bug in svn serf backend
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions