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.
tests/test-manifest.hg
author Greg Ward <greg-hg@gerg.ca>
Mon, 14 Jun 2010 16:06:52 -0400
changeset 11353 f2b25e8ea6c1
parent 5406 f11554a097c8
permissions -rw-r--r--
merge: when current branch has 1 or > 2 heads, actually abort. Currently merge just prints abort-like messages to stderr and then exits with a misleading status 0 (cleverly disguised as "False"). With this change it raises Abort, just like every other fatal error.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5406
f11554a097c8 test-manifest: test symlink and exec bit display
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
(binary:application/octet-stream)
hg-stable