comparison templates/map @ 6518:92ccccb55ba3

resolve: new command - add basic resolve command functionality - point failed update and merge at resolve
author Matt Mackall <mpm@selenic.com>
date Fri, 11 Apr 2008 12:52:56 -0500
parents 673d8a6bc709
children ccc2481e3954
comparison
equal deleted inserted replaced
6517:fcfb6a0a0a84 6518:92ccccb55ba3