comparison mercurial/encoding.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 c327bfa5e831
children 614f0d8724ab
comparison
equal deleted inserted replaced
12663:8269af351a64 12664:545ec1775021