[PATCH] Use merge3 for text merging

[Robey Pointer]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Slightly unrelated, but this is one thing that bugs me a lot about tla:

I'd really like to shout out in favor of some kind of inline conflict  
marking, even if it's not ">>>>>>>>".  tla's habit of dropping little  
*.orig and *.rej files and making me pick up the pieces is one of my  
pet peeves.  I noticed that bzr currently does the same thing  
(*.BASE, etc) and am hoping it's just a temporary thing. :)

Possibly because I use simple editors instead of cool GUI tools, it's  
much much easier for me to figure out a conflict by looking at it  
inline than it is for me to scan a handful of separate files.

Just my $0.02 (€0.005).

robey

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (Darwin)

iD8DBQFC5olKQQDkKvyJ6cMRArEgAJ48w1gq6HR9Pvhjc+JdtITPCLMvCgCg2Pf0
d8WMFbkrQVPjSneSWw144oQ=
=VmXl
-----END PGP SIGNATURE-----