diff python/prefs.py @ 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 31a41264d51f
children
line wrap: on
line diff