Merge branch 'jk/maint-add--interactive-delete' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:00 +0000 (00:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:00 +0000 (00:36 -0800)
* jk/maint-add--interactive-delete:
  add-interactive: fix bogus diff header line ordering

1  2 
git-add--interactive.perl

Simple merge