git add -p with unmerged files (was: git add -p with new file)

Hi,

While we're on the topic that "git add -p" should behave like the "normal" "git add" (not "git add -u"): what about unmerged changes?

When I have merge conflicts, I almost always use my aliases "edit-unmerged" and "add-unmerged":

$ git config --global --list | grep unmerged alias.list-unmerged=diff --name-only --diff-filter=U alias.edit-unmerged=!vim `git list-unmerged` alias.add-unmerged=!git add `git list-unmerged` alias.reset-unmerged=!uf=`git list-unmerged`; git reset HEAD $uf; git checkout -- $uf

The "add-unmerged" alias is always a little scary because I'd rather like to check the changes with the "git add -p" workflow I am used to.

Opinions?

Best
  Stephan