Merge branch 'tr/add-i-e'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 22:14:59 +0000 (15:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 22:14:59 +0000 (15:14 -0700)
* tr/add-i-e:
  git-add--interactive: manual hunk editing mode
  git-add--interactive: remove hunk coalescing
  git-add--interactive: replace hunk recounting with apply --recount


Trivial merge