diff tests/test-subrepo-deep-nested-change.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 2944a6d35158
children 4165cfd67519
line wrap: on
line diff