diff mercurial/merge.py @ 10930:230ab9a23594

wix updates - using FileSource attribute - removed unneeded "DiskId='1'" - all guids are now in guids.wxi
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 16 Apr 2010 14:57:30 +0200
parents 0e64d814d7d0
children 7a0d096e221e
line wrap: on
line diff