Sun Nov 07 16:07:20 2004: New ticket: 33. Transaction: Ticket created by guest Queue: Darcs Subject: From TODO: Write an interactive conflict resolution command. Owner: Nobody Requestors: droundy at abridgegame.org Status: new Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=33 >