Mercurial Mercurial > hg-stable / 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/win32/mercurial.ico
author Kevin Bullock <kbullock@ringworld.org>
Wed, 07 Dec 2011 11:23:01 -0600
changeset 15619 6c8573dd1b6b
parent 7659 25ac72ca68f6
permissions -rw-r--r--
merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7659
25ac72ca68f6 Add Lee Cantey's installer icon to win32 installer
Pascal Quantin <pascal.quantin@wavecom.com>
parents:
diff changeset 
     1
 
(binary:image/vnd.microsoft.icon)
hg-stable