Mercurial > public > mercurial-scm > hg

diff mercurial/help/merge-tools.txt @ 35320:d901a88891fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: rerun a rebase on-disk if IMM merge conflicts arise Differential Revision: https://phab.mercurial-scm.org/D1249
author Phil Cohen <phillco@fb.com>
date Fri, 08 Dec 2017 12:14:38 -0800
parents ff178743e59b
children 7c6044634957
line wrap: on
line diff