diff mercurial/filemerge.py @ 19482:499fc471296b stable

update: add tracking of interrupted updates (issue3113) This takes advantage of the new checkunfinished infrastructure
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jul 2013 00:33:28 -0500
parents c58b6ab4c26f
children 89b2336e5ccf
line wrap: on
line diff