comparison mercurial/filemerge.py @ 22951:6c86c673dde6

obsolete: add createmarkers option The basic obsolete option is allowing the creation of obsolete markers. This does not enable other features, such as allowing unstable commits or exchanging obsolete markers.
author Durham Goode <durham@fb.com>
date Tue, 14 Oct 2014 13:23:52 -0700
parents 38e0363dcbe0
children b405dd6c90bf
comparison
equal deleted inserted replaced
22950:bb8278b289ee 22951:6c86c673dde6