diff bin/hg-merge-branch.sh @ 325:bc2d0d504270

preserve mode (could, in theory, take from script)
author Jeff Hammel <jhammel@mozilla.com>
date Sat, 08 Jun 2013 08:42:21 -0700
parents cf793eb3811e
children
line wrap: on
line diff