Mercurial > hg > mercurial-crew-with-dirclash

view PKG-INFO @ 862:d70c1c31fd45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 10 Aug 2005 06:47:46 +0100
parents 20fc66131bc0
children 060c08bf9e2f
line wrap: on
line source

Metadata-Version: 1.0
Name: mercurial
Version: 0.6
Summary: scalable distributed SCM
Home-page: http://selenic.com/mercurial
Author: Matt Mackall
Author-email: mpm@selenic.com
License: GNU GPL
Description: UNKNOWN
Platform: UNKNOWN