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-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 15 Aug 2006 11:38:07 -0700
changeset 2903 013921c753bd
parent 2175 b2ae81a7df29
permissions -rw-r--r--
merge with other head by default, not tip. fixes issue 339.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
mercurial-crew-with-dirclash