summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-10 00:03:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-10 00:03:41 (GMT)
commit2f76a26ee707ab72c043148b38dfffb7a63ae516 (patch)
tree072dfb27fcb917d67626a9652ac474a35550f084 /Makefile
parented94cc768c0341f2e033901bb14f6030780a201e (diff)
parent7d79cb6ad5ef3061c8b5b25ff3f2d779b02ec472 (diff)
downloadgit-2f76a26ee707ab72c043148b38dfffb7a63ae516.zip
git-2f76a26ee707ab72c043148b38dfffb7a63ae516.tar.gz
git-2f76a26ee707ab72c043148b38dfffb7a63ae516.tar.bz2
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: t9143: do not fail when unhandled.log.gz is not created git-svn: allow the mergeinfo property to be set
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions