tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 02 Feb 2006 19:22:27 +0100
changeset 1685 60c3a55c61b8
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
extension gpg.py: really raise the exception in case of invalid data

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)