update dontmerge preference
authorNicole C. Engard <nengard@gmail.com>
Thu, 21 Aug 2014 13:04:19 +0000 (08:04 -0500)
committerNicole C. Engard <nengard@gmail.com>
Thu, 21 Aug 2014 13:04:40 +0000 (08:04 -0500)
commit514fddd5b591d289b2ac22d3f998c4067b870f17
treec2d2fc646c2650c21df6c8c30d22ace3919d8a07
parentedb194d33bda4a682e7180ed2ef0c97a11e4ad44
update dontmerge preference
en/manual.xml