@matheusbsbs / matheus-bagliano / commits / 47f16e8b11
Fork 0

Merge branch 'cb/maint-orphan-merge-noclobber' into maint

* cb/maint-orphan-merge-noclobber: do not overwrite untracked during merge from unborn branch

Junio C Hamano committed Dec 2, 2010 at 11:27 UTC 47f16e8b110d84bacb586a1b7183ee4bb781c980

No changes.