Avoiding conflicts in .hgtags

[Arne Babenhauserheide]

Am Montag 08 Dezember 2008 19:52:14 schrieb Greg Ward:
>   [merge-patterns]
>   .hgtags = hgmergetags
>
>   [merge-tools]
>   hgmergetags.args = $local $base $other > $output
>
> Script attached.  Feedback welcome.

I just tried it with groups and then skimmed over the code to see that it 
needs the layout of .hgtags. 

What is your reason for not just checking if lines are equal, that way making 
a merger for any kind of append/remove-only file? 

Best wishes, 
Arne
-- 
-- My stuff: http://draketo.de - stories, songs, poems, programs and stuff :)
-- Infinite Hands: http://infinite-hands.draketo.de - singing a part of the 
history of free software.
-- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-) Regeln.

-- PGP/GnuPG: http://draketo.de/inhalt/ich/pubkey.txt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : http://selenic.com/pipermail/mercurial/attachments/20081208/a89e818e/attachment.pgp