Mercurial > hg

comparison tests/test-conflict @ 5757:c5793dada959

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarify some messages during commit: - use "branch 'foo'" to distinguish from "branch merge". - commit messags can be empty (to abort commits) - Added value for editor message: Tell about HG: lines like CVS does.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Dec 2007 17:10:25 +0100
parents 93a4e72b4f83
children
comparison
equal deleted inserted replaced
5756:6183df642f95 5757:c5793dada959