tests/gpg/trustdb.gpg
author Andrew Halberstadt <ahalberstadt@mozilla.com>
Thu, 03 Dec 2015 23:01:59 -0500
changeset 27267 d6859d86a5d5
parent 8809 6fce36336e42
permissions -rw-r--r--
merge.graft: add option to keep second parent Currently merge.graft re-writes the dirstate so only a single parent is kept. For some cases, like evolving a merge commit, this behaviour is not desired. More specifically, this is needed to fix issue4389.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8809
6fce36336e42 gpg: add test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     1
(binary:application/octet-stream)