Mercurial > hg

diff templates/map @ 5708:f6bf89722e29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add flag merging intelligence - properly handle all 27 combinations of flags - prompt on conflicts
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 22:47:44 -0600
parents 6e0f05f6f68d
children 3340aa5a64f7 800e2756c9ab
line wrap: on
line diff