diff mercurial/localrepo.py @ 7768:5bf5fd1e2a74

merge: mark kept local files as readded on linear update (issue539)
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Feb 2009 10:50:48 -0600
parents b7ac53f7b061
children b8d750daadde
line wrap: on
line diff