4 Jun
2005
4 Jun
'05
1:19 p.m.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
On May 30, 2005, at 1:41 PM, Tom Lazar wrote:
every now and then i encounter some conflicts in my work with subversion and currently it's the only operation i cannot entirely manage from within TM (which is real shame, because the actual process of resolving the conflict has gotten a lot easier through TM and the diff-coloring!)
thanks, chris! much appreciated ;-)
(revision 1154 now has the resolved command included in the subversion bundle) - -- Tom Lazar, http://tomster.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)
iQIVAwUBQqGqa9eSJSslDUEWAQJanw/9EZwyTC0pr92SYewhdVhSyOYLFzN3Jh0m
xAOHicVK1JzifdxWi9vW1TvU1TOJcprKcP0i1AyOjg7R6ksytv5m2F2AUPa8Lgoy
fLBp3oPlq0TKkH8mOOW9szTDP7xettuiBrDsG1yhJmwWLelE9KPDhb+A8sCCeiMb
ttmTHRXVAVFz1SbThyobJUEafaCnavrY2up5IKrdq8B+POQfw0ZA6wLRmiEdRRZ1
T5H9+e1TprTJpvA6teUv9gsZEmcARm9sDP3ffXVDrAfBNGZlERNzO/vn26v2WrH9
ZNsDU1JBxLrTDwBWz2wYCaoyAQ1lHjQUAUzHhI1PxreCLaynuDLxXZTJ5SULAK3O
74VXMh5hLs3MOzFHfegESSLhPHlvFCWueSMWFl2JsDM20x7pXmLK9vQkchdlt1dX
E+sku98T15qrtYBxQa85Nnx0seSLqj/z5K8OORz3mklEl5ia/6D5I8qrKHAC0hV4
YCPX5Sj8wmxvdk6pRkRfC6Z50Hp50QSXmJuPxMUZhiMR0T4EgvPBwZ1smxaquUpn
0/KWj+pNfed8kzqswO/fmdsZsutpx+IJ02+bhhQ9kfQh7bQoloMc8kA7R7bWWEgV
HC6bToFQN7iirCZKCdDwsFi8ar0Rxx7AO+841jMp0HuyjDrDk1yaMcGWvKCHwZtz
4HJEbtamzPQ=
=YZ0S
-----END PGP SIGNATURE-----