Merge branch 'maint'
commit41d5b7e362c33dc54cbc814e50403a2084204f9f
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Nov 2009 08:56:05 +0000 (27 00:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Nov 2009 08:56:05 +0000 (27 00:56 -0800)
tree2885eb362c2497c39f8bf11147ee59e95b72c8ab
parente7821d73bd0256bfc15c48945beded063e17c1b6
parentec7fc0b1a46c5a352532ea3f29c5663752fd8ac6
Merge branch 'maint'

* maint:
  builtin-apply.c: pay attention to -p<n> when determining the name