Mercurial > hg

comparison mercurial/error.py @ 21537:1ab30e9ba0fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: specify custom conflict markers for update (BC) Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.
author Durham Goode <durham@fb.com>
date Fri, 09 May 2014 18:09:11 -0700
parents 28d76afa1568
children 7568f5c1c801
comparison
equal deleted inserted replaced
21536:92a6b16c9186 21537:1ab30e9ba0fc