comparison doc/hgmerge.1.txt @ 5837:2580d418e3f0

Issue #880: Simple misspelling ('occured') in web error message.
author Jesse Glick <jesse.glick@sun.com>
date Sat, 05 Jan 2008 15:35:46 -0500
parents 63b9d2deed48
children
comparison
equal deleted inserted replaced
5836:c5c9a022bd9a 5837:2580d418e3f0