Merge branch 'maint-1.6.1' into maint
commit9a6682bab5e800465f0a4e44cdf18fe396ff4f6d
authorJunio C Hamano <gitster@pobox.com>
Sun, 8 Mar 2009 05:00:27 +0000 (7 21:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 8 Mar 2009 05:00:27 +0000 (7 21:00 -0800)
tree3c30b2efc28194a883daced243837aa9ce9a69dd
parentd57f07ebae7e84b356ff2b891adeccf965d2ba11
parent0d66e95903a5c2567baa61cc7299ce865abe41b1
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  builtin-revert.c: release index lock when cherry-picking an empty commit
builtin-revert.c