Mercurial Mercurial > hg-stable / 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-issue619.out
author Tobias Bell <tobias.bell@gmail.com>
Wed, 01 Apr 2009 21:06:12 +0200
changeset 7938 b08be68bbc4f
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
i18n-de: removed fuzzy translations after update of POT file

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: can't merge with ancestor
done
hg-stable