Mercurial > hg

annotate tests/gpg/secring.gpg @ 16794:98687cdddcb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: warn about file deleted in one branch and renamed in other (issue3074) For divergent renames the following message is printed during merge: note: possible conflict - file was renamed multiple times to: newfile file2 When a file is renamed in one branch and deleted in the other, the file still exists after a merge. With this change a similar message is printed for mv+rm: note: possible conflict - file was deleted and renamed to: newfile
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 20:50:16 +0200
parents 6fce36336e42
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8809
6fce36336e42 gpg: add test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 (binary:application/octet-stream)