Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4744:620cea146b19
mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm
author | Adam Spiers <hg@adamspiers.org> |
---|---|
date | Sat, 30 Jun 2007 01:21:22 +0100 |
parents | dc5920ea12f8 |
children | 8808ea7da86b |