Mercurial > hg

diff tests/test-merge1.t @ 33491:1adcb594eb6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: use 'applychanges' for bookmark update There is still some use of 'deletedivergent' bookmark here. They will be taken care of later. The 'deletedivergent' code needs some rework before fitting in the new world.
author Boris Feld <boris.feld@octobus.net>
date Mon, 10 Jul 2017 19:40:23 +0200
parents 2428e8ec0793
children 24849d53697d
line wrap: on
line diff