diff hgweb.cgi @ 22030:ecdff28d13e2

mergetools: add a test for premerge --keep It works! No surprise.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 04 Aug 2014 16:50:15 -0700
parents 85cba926cb59
children 4b0fc75f9403
line wrap: on
line diff