diff mercurial/help/merge-tools.txt @ 14687:15200b46165b stable

merge default branch into stable to mark the start of the code freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Jun 2011 17:03:01 -0500
parents 6eec9d7c6e0f
children 0c4bec9596d8
line wrap: on
line diff