.placeholder @ e30544496575

mercurial: add real merge aliases

author	Steve Losh <steve@stevelosh.com>
date	Fri, 01 Oct 2010 00:08:20 -0400
parents	53d154da65a9
children	(none)