diff mercurial/merge.py @ 5269:46c5e1ee8aaa

Added support for the Atom syndication format
author Robert Bachmann <rbach@rbach.priv.at>
date Thu, 30 Aug 2007 16:42:17 +0200
parents 90d9ec0dc69d
children 17ed9b9a0d03
line wrap: on
line diff