Re: [gentoo-user] [OT] File merge tool

2009-07-23 Thread Roy Wright
kdiff3 is my favorite graphical merge tool (hey, even have it running on my macbook). On Jul 22, 2009, at 2:49 PM, Harry Putnam wrote: Summary: Any suggestions for a file merge tool? Details: I'd like to try just actually manually merging bookmarks.html files from different computers.

Re: [gentoo-user] [OT] File merge tool

2009-07-23 Thread Justin
Roy Wright schrieb: kdiff3 is my favorite graphical merge tool (hey, even have it running on my macbook). On Jul 22, 2009, at 2:49 PM, Harry Putnam wrote: Summary: Any suggestions for a file merge tool? Details: I'd like to try just actually manually merging bookmarks.html files from

[gentoo-user] [OT] File merge tool

2009-07-22 Thread Harry Putnam
Summary: Any suggestions for a file merge tool? Details: I'd like to try just actually manually merging bookmarks.html files from different computers. Diff and Patch seem kind of hard or maybe impossible to use for this. If you have identical parts in different places they will just keep