Andrew's git / gitweb.git / diff
?
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)
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

Trivial merge