From darcs-users  Wed Feb 02 13:07:54 2005
From: Thomas Zander <TZander () factotummedia ! nl>
Date: Wed, 02 Feb 2005 13:07:54 +0000
To: darcs-users
Subject: Re: [darcs-users] How to resolve merge conflicts without GUI?
Message-Id: <20050202130754.GA13108 () factotummedia ! nl>
X-MARC-Message: https://marc.info/?l=darcs-users&m=111337379813330
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--d6Gm4EdcadzBjdND"


--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 27, 2005 at 07:22:33AM -0500, David Roundy wrote:
> On Wed, Jan 26, 2005 at 06:40:49PM +0100, Thomas Zander wrote:
> > I would also like to know why different markers were chosen; they are
> > much more annoying to type in a search then the >>> or <<< from cvs...
>=20
> It's because in darcs you can have a three-way conflict (or worse), in
> which case it's not clear how to choose the >>> and <<< directions.  That=
's
> not a very good reason, and it's something I'll happily consider changing
> when the new conflict code is being finished.

I'd like to see that; and if nothing else; please don't add spaces between
the vs or ^s.  Its much easier to type "^^^^" then "^ ^ ^ ^" in your
search dialog :-)

Cheers!
--=20
Thomas Zander

--d6Gm4EdcadzBjdND
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFCANCqCojCW6H2z/QRAh8bAJ4qhMRn6mQZBa7ROmhPpQFbM9sJewCfUKuy
hJFDlS/pt4MGgYOBGNcWd/M=
=/ejp
-----END PGP SIGNATURE-----

--d6Gm4EdcadzBjdND--