Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/__init__.py @ 1772:b1a7fd503a29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgmerge: logic changes Details: - keep automatic merge conflicts in $LOCAL - do not assume that $EDITOR returns proper error code - fix a slight mistake in diff+patch merge success detection (it could succeed if the $EDITOR failed to run)
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Tue, 21 Feb 2006 15:48:16 -0600
parents 7d439981bec4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1360
7d439981bec4 Re-add hgext/__init__.py
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 # placeholder