tags 466006 pending thanks With the 1.0 version of Mercurial, when you use meld for merging(with hg merge), the files have meaningful names.
From the meld help, in the 'File comparison' section:
"For two way comparisons the original is shown in the left pane and
the modified version in the right pane by convention.
For three way comparisons, the original is shown in the centre
pane and the left and right panes show the modified versions. By
convention we put the locally modified file in the right pane. "
In the case of the 3-way comparison, The file name in the center pane is
in the format $FILE~base.$HASH, $FILE for the left pane (your version)
and $FILE~other.$HASH for the right pane(the file you want to merge).
--
Gerardo Curiel <[EMAIL PROTECTED]> <[EMAIL PROTECTED]>
Geek By NaTure,LiNuX By ChOiCe,DebiAn of CoUrsE
gpg fingerprint: 228B 0F96 8653 DF52 9740 B75E FB32 9C30 E179 7BD2
http://www.debian.org
signature.asc
Description: Esta parte del mensaje está firmada digitalmente
