Wireshark-dev: Re: [Wireshark-dev] [Patch] epan/libwireshark.def
From: Gisle Vanem <[email protected]>
Date: Wed, 31 Oct 2007 20:47:55 +0100
"Guy Harris" <[email protected]> wrote:

Does "svn status" report any conflicts (lines beginning with "C")?
No.

--gv