It is possible to add to the "Conlict Solver", the timestamp information of a change and file modification date ?
When I compare code, I dont' know wich file is more recent. And if we can have the chnage date of a line, you win ! :-D
Customer support service by UserEcho