diff mercurial/archival.py @ 2912:dd41ad984f71

merge: factor out exec bit merge function
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 15:58:10 -0500
parents 18cf5349a361
children 1d2fdea875bc
line wrap: on
line diff