diff tests/test-merge-local.t @ 18712:e3ddb4068757

scmutil: fix NameError on windows Forgot to import util in mercurial.scmwindows. Error was introduced in: changeset: 18862:4c6f7f0dadab user: Kevin Bullock <kbullock@ringworld.org> date: Tue Feb 12 11:36:21 2013 -0600 summary: scmutil: split platform-specific bits into their own modules
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 21 Feb 2013 13:16:02 -0600
parents 2371f4aea665
children ef1eb6df7071
line wrap: on
line diff