tags 537594 +pending
thanks
Hi,
The following change has been committed for this bug by
Manoj Srivastava <sriva...@debian.org> on Sun, 16 Aug 2009 10:08:53 -0500.
The fix will be in the next upload.
=========================================================================
[master]: Fix up a bad conflict resolution decision
When merging from stolen-from-cvs, a bad conflict resolution decision was
made. This reverts the forms used to be closer to what upstream CVS is
using.
Closes: #537594
Signed-off-by: Manoj Srivastava <sriva...@debian.org>
=========================================================================
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
