Mercurial > hg

diff mercurial/merge.py @ 15935:6c97eb445341

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
author Matt Mackall <mpm@selenic.com>
date Thu, 19 Jan 2012 14:07:48 -0600
parents 44fa047cef57
children fcf66193b186
line wrap: on
line diff