diff python/hg-merge.py @ 244:5e69f8c64b6e

weird hack needed to get the proper firefox via fluxbox on new system
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 20 Nov 2012 18:42:54 -0800
parents 7bad4b7281f2
children
line wrap: on
line diff