diff tests/test-gpg.t @ 18332:6ba58ab719e5

merge: .hgsubstate is special as merge destination, not as merge source
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents 7922004a46b8
children e5a2177d97f0
line wrap: on
line diff