diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:23:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:23:07 -0700 |
| commit | 06cbc13c6cb8867af1127ac52e005b3c36506320 (patch) | |
| tree | 2067203fdbf3d06f08f9795458908aa4921eac00 /t/t5100/.gitattributes | |
| parent | Sync with maint (diff) | |
| parent | t2202: make sure "git add" (no args) stays a no-op (diff) | |
| download | tgif-06cbc13c6cb8867af1127ac52e005b3c36506320.tar.xz | |
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
Diffstat (limited to 't/t5100/.gitattributes')
0 files changed, 0 insertions, 0 deletions