diff .hgrc @ 207:7bad4b7281f2

add a file to merge hg repositories
author Jeff Hammel <jhammel@mozilla.com>
date Mon, 13 Feb 2012 16:22:59 -0800
parents 60c8a2506630
children 06b47566e7f1
line wrap: on
line diff