| commit | 47f16e8b110d84bacb586a1b7183ee4bb781c980 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Dec 2010 19:27:13 +0000 (2 11:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Dec 2010 19:27:13 +0000 (2 11:27 -0800) | ||
| tree | a95b90d7863c72c41ba825d21c21fc1daf0edbba | treesnapshot (tar.gz zip) |
| parent | 54d04f2b077496739f9fdf04ff8abf24feb33576 | commitdiff |
| parent | 172b6428d06ff4eb0812f087a497d50b6c878fe1 | commitdiff |
Merge branch 'cb/maint-orphan-merge-noclobber' into maint
* 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 | blobhistory |
| t/t7607-merge-overwrite.sh | diff1 | diff2 | blobhistory |