Mercurial > hg
view contrib/wix/dist.wxs @ 18694:6a012704c841
mergetools: vimdiff issue a warning explaining how to abort
Adds a message displayed at each vimdiff invocation:
merge conflict detected, type ":cq" to abort
Vimdiff is very confusing for non-vim user (not to speak about vim user confused
anyway. However it is very likely that vimdiff is picked as the mergetool of
choice when using the default config:
- vim is available on all UNIX system.
- Its one of the rare non graphical merge tools.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 15 Feb 2013 11:28:04 +0100 |
parents | 59581b667cd7 |
children | 95e042d77a5f |
line wrap: on
line source
<?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include guids.wxi ?> <?include defines.wxi ?> <Fragment> <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)"> <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'> <File Name="library.zip" KeyPath="yes" /> <File Name="mercurial.base85.pyd" /> <File Name="mercurial.bdiff.pyd" /> <File Name="mercurial.diffhelpers.pyd" /> <File Name="mercurial.mpatch.pyd" /> <File Name="mercurial.osutil.pyd" /> <File Name="mercurial.parsers.pyd" /> <File Name="pyexpat.pyd" /> <File Name="python27.dll" /> <File Name="bz2.pyd" /> <File Name="select.pyd" /> <File Name="unicodedata.pyd" /> <File Name="_ctypes.pyd" /> <File Name="_elementtree.pyd" /> <File Name="_hashlib.pyd" /> <File Name="_socket.pyd" /> <File Name="_ssl.pyd" /> </Component> </DirectoryRef> </Fragment> </Wix>