diff mercurial/dirstate.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 4cdaf1adafc8
children e255a5dc29e6
line wrap: on
line diff