diff python/hg-merge.py @ 561:0d5cf87e5b7e

alias -> function
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 03 Dec 2013 09:14:04 -0800
parents 7bad4b7281f2
children
line wrap: on
line diff