diff mercurial/templates/map-cmdline.changelog @ 22026:6966542768ff

filemerge: allow the formatting of three labels instead of two When a third label is provided (to included the base content) it is properly processed as the two others. Nothing changes if only two labels are provided.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 05 Aug 2014 15:17:38 -0700
parents f91e5630ce7e
children f4aeb952ab77
line wrap: on
line diff