diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:27:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:27:13 -0800 |
| commit | 47f16e8b110d84bacb586a1b7183ee4bb781c980 (patch) | |
| tree | a95b90d7863c72c41ba825d21c21fc1daf0edbba /t/t9401-git-cvsserver-crlf.sh | |
| parent | Merge branch 'jk/add-e-doc' into maint (diff) | |
| parent | do not overwrite untracked during merge from unborn branch (diff) | |
| download | tgif-47f16e8b110d84bacb586a1b7183ee4bb781c980.tar.xz | |
Merge branch 'cb/maint-orphan-merge-noclobber' into maint
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch
Diffstat (limited to 't/t9401-git-cvsserver-crlf.sh')
0 files changed, 0 insertions, 0 deletions