diff mercurial/ancestor.py @ 28023:b7bf2b0731be

merge: document checkignored and checkunknown configs again These options were undocumented for 3.7 because of an issue found during the freeze (see rev 7cb7264cfd52). This issue has now been fixed, so we can document these options again.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 01 Feb 2016 20:28:32 -0800
parents 7ef98b38163f
children ead25aa27a43
line wrap: on
line diff