diff python/hg-merge.py @ 497:2e51a55d303d

bin/setup-X.sh
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 14 Aug 2013 10:25:08 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff