Mercurial > hg
comparison mercurial/help/hgweb.txt @ 25844:18541e9510c5
merge: make merge.preferancestor type and default consistent
(and mark it)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 25 Jun 2015 17:54:55 -0500 |
parents | a3f2ea1d4943 |
children | 1aee2ab0f902 |
comparison
equal
deleted
inserted
replaced
25843:bf9ea348b487 | 25844:18541e9510c5 |
---|