Hi,
When I land up with two heads after a pull is there
a simple way to:
a) list all files changed on each branch
b) list those files changed in both branches (and therefore
in clear conflict, the old Codemgr_wsdata/conflicts)
(obviously b) can follow from a) with some simple scripting)
Evidently 'hg merge' works through such lists, and the hgk
visualizer appears to color-code changesets that have
clearly conflicting files between the two branches.
On a complex merge you need to revisit these lists
a few times!
Thanks
Gavin
