diff contrib/win32/mercurial.ini @ 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 45235e492cc6
children 2300632a3bc8
line wrap: on
line diff