diff mercurial/templatekw.py @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 6faf015e0ba0
children 6c375e07d673
line wrap: on
line diff