From: Justin <justin@j-schmitz.net>
To: gentoo-user@lists.gentoo.org
Subject: Re: [gentoo-user] [OT] File merge tool
Date: Thu, 23 Jul 2009 10:27:23 +0200 [thread overview]
Message-ID: <4A681EEB.7060106@j-schmitz.net> (raw)
In-Reply-To: <94EE9E0D-2E3C-458E-8768-704EC7D294B3@wright.org>
[-- Attachment #1: Type: text/plain, Size: 989 bytes --]
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 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
>> adding up... no way to weed out duplication.
>>
>> If there anything that can do that or at least help me do it.
>>
>> I'm not talking about bookmark merge/storage things like Xmarks or
>> foxmarks. My files are not so large that I couldn't do it by hand
>> but would need some smart helper tool.
>>
>>
>>
>
>
Along time I used tkdiff and it worked really fine, since yesterday I
swapped to the new package diffuse, which is actually the same in gtk.
justin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2009-07-23 8:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-22 19:49 [gentoo-user] [OT] File merge tool Harry Putnam
2009-07-23 4:35 ` Roy Wright
2009-07-23 8:27 ` Justin [this message]
2009-07-25 15:13 ` [gentoo-user] " Harry Putnam
2009-07-25 15:00 ` Harry Putnam
2009-07-26 8:29 ` Stroller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A681EEB.7060106@j-schmitz.net \
--to=justin@j-schmitz.net \
--cc=gentoo-user@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox