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:47 +0000 (08:04 -0500)
commitc5720cc08a1d7b385889104622b4de8ca898c5a3
tree93542c9e88f2c362f37fdd9f55939c077f97dd33
parent1d1f4f5530e9f677d0e1abfe7d4e0d0cb51dbc45
update dontmerge preference
en/manual.xml