annotate tests/bundles/rebase.hg @ 18042:551e2901192e

merge: fix mistake in moved _checkcollision call from 5881d5b7552f
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 06 Dec 2012 22:07:44 -0600
parents 624e5ce615ec
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14119
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
1 (binary:application/octet-stream)