[4149] in Release_7.7_team
graphical merge software case 475599
daemon@ATHENA.MIT.EDU (Alex T Prengel)
Fri Dec 12 13:06:03 2003
Message-Id: <200312121805.hBCI5sLf023293@dit.mit.edu>
To: owls@MIT.EDU
cc: ops@MIT.EDU, release-team@MIT.EDU, support-acs@MIT.EDU,
casetracker@MIT.EDU
Date: Fri, 12 Dec 2003 13:05:54 -0500
From: Alex T Prengel <alexp@MIT.EDU>
Hi folks,
This request came in through the 3partysw mailing list and probably should
have gone to suggest. I took a quick look at the site and pricing
seems to be per machine- so it's likely to be pretty expensive to license
for all of MIT (I don't know if site licensing is an option).
Any advice on how we should respond to this appreciated- perhaps it
could be discussed at owls?
Thanks,
Alex
------- Forwarded Message
To: 3partysw@MIT.EDU
Date: Thu, 11 Dec 2003 16:05:45 -0500
From: Ilya Shlyakhter <ilya_shl@MIT.EDU>
cc: ilya_shl@MIT.EDU
Subject: [3partysw] software suggestion: graphical 3-way merge
it would be good if athena had some kind of graphical merge
software, e.g. http://www.guiffy.com/
and if this software was integrated with CVS.
the default merge of CVS can be very painful and there are many
improved versions available.
would be useful to most CVS users.
ilya
_______________________________________________
3partysw mailing list
3partysw@mit.edu
http://mailman.mit.edu/mailman/listinfo/3partysw
------- End of Forwarded Message
