Merge branch 'jc/simple-add-must-be-a-no-op'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:06 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:07 +0000 (11:23 -0700)
commit06cbc13c6cb8867af1127ac52e005b3c36506320
tree2067203fdbf3d06f08f9795458908aa4921eac00
parent805c5a578995db7594ad0751a683bc6422655c29
parent76b623584cee2421b84e12050b7ee53b0c08ee89
Merge branch 'jc/simple-add-must-be-a-no-op'

This detected a mismerge of one of "add-2.0" topics to the 'jch'
and 'pu' branches.

* jc/simple-add-must-be-a-no-op:
  t2202: make sure "git add" (no args) stays a no-op