diff tests/test-rebase-collapse.t @ 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 ec5ef276077f
children a55b06885cda
line wrap: on
line diff