contrib/win32/mercurial.ico
author Siddharth Agarwal <sid0@fb.com>
Wed, 06 Nov 2013 10:20:18 -0800
branchstable
changeset 19987 ba6486076429
parent 7659 25ac72ca68f6
permissions -rw-r--r--
merge: move forgets to the beginning of the action list Forgets need to be in the beginning of the action list, same as removes. This lets us avoid clashes in the dirstate where a directory is forgotten and a file with the same name is added, or vice versa.
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)