Re: How to undo a merge / conflict?
From: Michael W Thelen <thelenm_at_cs.utah.edu>
Date: 2004-07-06 21:17:26 CEST
* Wadsworth, Eric (Contractor) <firstname.lastname@example.org> [2004-07-06 13:13]:
Look for a file called <file>.mine, where <file> is the name of the file
-- Michael W. Thelen It is a painful thing To look at your own trouble and know That you yourself and no one else has made it -- Sophocles, "Ajax"
This is an archived mail posted to the Subversion Users mailing list.