![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 23:55:36 +0000 (15:55 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 23:55:36 +0000 (15:55 -0800) | ||
| commit | 7d43de925b2771d295d8fc4341b7bd544e2a74fa | |
| tree | 06cd429ed1ed04337eeaf23f6d72855fd94d3c0b | tree | snapshot |
| parent | 01530432f73e7a29fbb9c4bc62aa88fba125ca7d | commit | diff |
| parent | 172b6428d06ff4eb0812f087a497d50b6c878fe1 | commit | diff |
Merge branch 'cb/maint-orphan-merge-noclobber'
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| t/t7607-merge-overwrite.sh | diff1 | | diff2 | | blob | history |