comparison tests/test-conflict @ 3727:0fb66912040a

merge: report destinations of moves in merge action messages
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Nov 2006 17:36:33 -0600
parents e506c14382fd
children 46280c004f22
comparison
equal deleted inserted replaced
3726:752884db5037 3727:0fb66912040a