Merge branch 'jk/maint-add--interactive-delete'
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 20:47:14 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 20:47:14 +0000 (12:47 -0800)
* jk/maint-add--interactive-delete:
  add-interactive: fix bogus diff header line ordering

1  2 
git-add--interactive.perl

Simple merge