Mercurial > hgrepos > DevTools > mercurial-extensions

diff test2.txt @ 269:1e375da37f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
First part of testing the a merge with yields conflicts (with tool ":merge3")
author Franz Glasner <hg@dom66.de>
date Fri, 04 Jan 2019 17:09:30 +0100
parents 47b931eb39b9
children
line wrap: on
line diff