diff python/hg-merge.py @ 310:a6cd6900419e

whview and whemacs use realwhich
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 17 May 2013 02:31:37 -0700
parents 7bad4b7281f2
children
line wrap: on
line diff