Better formatting when merging.
commit3458e3f24d1ebebcef2dbf54df23ebc01f6ed266
authorThomas Leonard <talex5@gmail.com>
Sat, 17 Nov 2007 11:54:04 +0000 (17 11:54 +0000)
committerThomas Leonard <talex5@gmail.com>
Sat, 17 Nov 2007 11:54:04 +0000 (17 11:54 +0000)
treeb183de2e1d898ae894780fee22fa8501160aecee
parent553dd17b59255c1ac7a241cbbd164711ba9b64ff
Better formatting when merging.

git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/trunk/0publish@2081 9f8c893c-44ee-0310-b757-c8ca8341c71e
merge.py
xmltools.py [new file with mode: 0644]