Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/wix/hg.cmd
author Erik Huelsmann <ehuels@gmail.com>
Sun, 16 Aug 2015 10:19:00 +0200
changeset 26071 ff12a6c63c3d
parent 13041 79388a8325dc
permissions -rw-r--r--
filemerge: add 'union' merge to internal merge tool 'union merge' is a merge strategy which adds both left and right hand side of a conflict region. Git implements this merge strategy which is very practical to have for merging e.g. the Changelog file.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13041
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset 
     1
 
@echo off
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset 
     2
 
rem launch hg.exe from parent folder
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset 
     3
 
"%~dp0\..\hg.exe" %*
Mercurial