diff doc/hg.1.txt @ 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 b13dae8ed779
children ab798a37b846
line wrap: on
line diff