![[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) |
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch
do not overwrite untracked during merge from unborn branch
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/merge.c | patch | | diff1 | | diff2 | | blob | history |
| t/t7607-merge-overwrite.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/merge.c
Simple merge
diff --cc t/t7607-merge-overwrite.sh
Simple merge