Use merge-recursive in git-checkout -m (branch switching)
authorJunio C Hamano <junkio@cox.net>
Wed, 17 Jan 2007 04:46:39 +0000 (20:46 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 Jan 2007 05:32:06 +0000 (21:32 -0800)
commitc1a4278...e3f99ca9db94bd032b047b3d19ac6e5f
tree1122009...da16c2a8a31851018c921dd9a9538afccopy hash to clipboard (tree)
parent7905ba6...6e14c32d09a412c168931486ceedb6eccopy hash to clipboard (diff)
git-checkout.sh
t/t7201-co.sh