BZR conflict list format 1
path: debian/changelog
type: text conflict
file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1

path: debian/changelog.BASE.moved
type: duplicate
action: Moved existing file to
conflict_path: debian/changelog.BASE

path: debian/changelog.OTHER.moved
type: duplicate
action: Moved existing file to
conflict_path: debian/changelog.OTHER

path: debian/changelog.THIS.moved
type: duplicate
action: Moved existing file to
conflict_path: debian/changelog.THIS