Merge branch 'pw/add-p-edit-ita-path'

"add -p" now allows editing paths that were only added in intent.

* pw/add-p-edit-ita-path:
  add -p: fix editing of intent-to-add paths

diff --cc add-patch.c
Simple merge

diff --cc git-add--interactive.perl
Simple merge

diff --cc t/t3701-add-interactive.sh
Simple merge