Merge branch 'maint'
commit8c4e4ec3ff053331c845331645a437b01b1f0de6
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Jul 2013 19:46:54 +0000 (1 12:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Jul 2013 19:46:54 +0000 (1 12:46 -0700)
tree2eb332d5fa1ce82ba8d561ab3abb5bd27e2fcf6a
parent51f11d69b16ab6614b79b3b4c12d35ca2b450a22
parentf66d000b0d7d6d3c858f3aacd9a67d4809ac8011
Merge branch 'maint'

* maint:
  t7500: fix flipped actual/expect
  lib-rebase: document exec_ in FAKE_LINES
t/lib-rebase.sh