Mercurial > hg-stable
diff hgeditor @ 22027:b98e5c7afc70
internal:merge: update documentation
Highlight the fact there are two regions in the markers and what their contents
are. This prepares for the arrival of merge3.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 05 Aug 2014 15:09:54 -0700 |
parents | 2b440bb8a66b |
children | 1aee2ab0f902 |