##// END OF EJS Templates
rebase: in --confirm option just abort if hit a conflict...
rebase: in --confirm option just abort if hit a conflict Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is at least one conflict. But for simplicity we can just abort if we hit a conflict and no need to prompt in that case. Differential Revision: https://phab.mercurial-scm.org/D3944

File last commit:

r22445:5716d10e default
r38701:b3d0c97a @81 default
Show More
contrib.wxs
43 lines | 1.4 KiB | text/plain | TextLexer
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<Fragment>
<ComponentGroup Id="contribFolder">
<ComponentRef Id="contrib" />
<ComponentRef Id="contrib.vim" />
</ComponentGroup>
</Fragment>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="contribdir" Name="contrib" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="contrib" Guid="$(var.contrib.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="bash_completion" KeyPath="yes" />
<File Name="hgk" />
Steve Borho
wix: hgweb file renames
r11006 <File Name="hgweb.fcgi" />
<File Name="hgweb.wsgi" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="logo-droplets.svg" />
<File Name="mercurial.el" />
<File Name="tcsh_completion" />
<File Name="tcsh_completion_build.sh" />
<File Name="xml.rnc" />
<File Name="zsh_completion" />
</Component>
<Directory Id="vimdir" Name="vim">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="hg-menu.vim" KeyPath="yes" />
<File Name="HGAnnotate.vim" />
<File Name="hgcommand.vim" />
<File Name="patchreview.txt" />
<File Name="patchreview.vim" />
Steve Borho
wix: add vim syntax file for Mercurial unit tests
r12792 <File Name="hgtest.vim" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Component>
</Directory>
</Directory>
</DirectoryRef>
</Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>