Mercurial > hg

diff tests/test-casecollision-merge.t @ 18042:551e2901192e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ce7bc04d863b
children 370d9ea027b1
line wrap: on
line diff