diff mercurial/extensions.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 3efadce5b346
children 891ddf76b73e
line wrap: on
line diff