Mercurial > hg

diff mercurial/merge.py @ 18970:3cdb6f2f6789

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templatekw: add default styles for hybrid types (issue3887) This allows elements like file_copies to be printed as 'name (source)' when used with join.
author Matt Mackall <mpm@selenic.com>
date Tue, 16 Apr 2013 09:44:29 -0500
parents ed676ed67a5c
children a59e575c6ff8
line wrap: on
line diff