diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-10-31 13:36:29 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-31 22:16:40 +0400 |
| commit | a21455ae664c1a29c157e2bc5ea3abe8e2699eca (patch) | |
| tree | 849957bb922b5521c8a241bf9d941143d75cdaea /attr.c | |
| parent | 3d092bfc6f2d9a998967979f926c661e9762601c (diff) | |
transport-helper: mismerge fix
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.
Reported-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'attr.c')
0 files changed, 0 insertions, 0 deletions