July 13, 2012
2:50 p.m.
Sean P. DeNigris wrote
There are two different things shown by the merge tool, changes and conflicts...
The behavior I described is on Pharo1.4 Latest update: #14453 -- View this message in context: http://forum.world.st/Monticello-Merge-detected-conflict-tp4639802p4639855.h... Sent from the Pharo Smalltalk mailing list archive at Nabble.com.