diff bin/hg-merge-branch.sh @ 434:d4f6995812c1

more sensible defaults
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 08 Aug 2013 09:49:54 -0700
parents cf793eb3811e
children
line wrap: on
line diff