rebase: error out for NO_PYTHON if they use recursive merge
authorEric Wong <normalperson@yhbt.net>
Wed, 21 Jun 2006 10:04:42 +0000 (03:04 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 10:56:30 +0000 (03:56 -0700)
commit693c15d...282c36042eac8d215beae3067db7565c
treee61b9d2...2c16360ebca965a77d93feff4e2bfae7copy hash to clipboard (tree)
parentc3fb0e3...8e594d081c7c0f37d557e29d2a5460b4copy hash to clipboard (diff)
git-rebase.sh
t/t3402-rebase-merge.sh