Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Jul 2013 19:46:54 +0000 (12:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Jul 2013 19:46:54 +0000 (12:46 -0700)
* maint:
t7500: fix flipped actual/expect
lib-rebase: document exec_ in FAKE_LINES

1  2 
t/lib-rebase.sh
diff --cc t/lib-rebase.sh
Simple merge