Mercurial > hg

diff tests/test-bookmarks-merge.t @ 27267:d6859d86a5d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.graft: add option to keep second parent Currently merge.graft re-writes the dirstate so only a single parent is kept. For some cases, like evolving a merge commit, this behaviour is not desired. More specifically, this is needed to fix issue4389.
author Andrew Halberstadt <ahalberstadt@mozilla.com>
date Thu, 03 Dec 2015 23:01:59 -0500
parents 10f15e34d86c
children 8197b395710e
line wrap: on
line diff