.hgsubstate @ e30544496575

mercurial: add real merge aliases
author Steve Losh <steve@stevelosh.com>
date Fri, 01 Oct 2010 00:08:20 -0400
parents 80a3dd238309
children 9b4c2bff117e
0beba32679db6cf5db08ae57c5e99e411b54adc5 mercurial/templates