Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 4845:e4480f2b61e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check for conflict markers in hgmerge (issue471)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 08 Jul 2007 13:44:41 +0200
parents 9797124581c9
children 931f901ab811
line wrap: on
line diff