join files or use version control merge

[message]

Readers,

Originally posted into diaspora:

For those unaware, newsbeuter is a command terminal ATOM/RSS reader. Can 
someone suggest a way to synchronise changes to various feeds lists (at 
least > 4 different computers)

For example:
url file 1, computer 1, sign-in 1970-01-01
http://path/to/rss/feed
url file 2, computer 2, sign-in 1970-01-05

http://path/to/rss/feed

http://path/to/another/atom/feed


url file 3, computer 3, sign-in 1970-01-20

http://path/to/rss/feed "category tag"

http://path/to/another/atom/feed

The request is to be able to sign-in to computer 1 again and "merge" all 
changes:


url file 1, computer 1, sign-in 1970-01-29
http://path/to/rss/feed "category tag"
http://path/to/another/atom/feed
The best scenario would be to use some sort of version control 
(mercurial) and a usb memory tool to transfer the latest version on 
different machines. Any suggestions please?