comparison deploy/linux/control @ 603:10ef94e51f44

Make sure we update the view after a failed merge
author Chris Cannam
date Tue, 03 Jul 2012 10:08:44 +0100
parents 212093882e4a
children 21e4df9865af
comparison
equal deleted inserted replaced
602:92929d26b8db 603:10ef94e51f44