Patch Set 3: Looks good to me, but someone else must approve; No score

I hesitate to submit the change because I would prefer a dialog when the repo is in state conflict and "add to index" it not yet supported.