Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
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-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 30 Mar 2006 18:43:46 +0200
changeset 2023 3bdd3bf17cfa
parent 2019 ced2d3620f95
child 2038 5c4496ed152d
permissions -rw-r--r--
Use [ x = y ] instead of [ x == y ] in shell scripts.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or '-C' to lose changes)
mercurial-crew-with-dirclash