Mercurial > hg

comparison hgeditor @ 22032:d7f25834ffbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge-tools: add a `premerge=keep-merge3` config option This value leaves premerge markers that includes the merge base too. This is a the same as what `internal:merge3` would do.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 04 Aug 2014 16:32:41 -0700
parents 2b440bb8a66b
children 1aee2ab0f902
comparison
equal deleted inserted replaced
22031:b36c60cfe46f 22032:d7f25834ffbb