I’m looking for a good file merging tool. I’m merging two files that were previously branched. I want an output file with some changes from the first file and some changes from the second file.
sdiff is the basic command line tool to do this, but I would prefer something that is graphical. imediff2 is also a bit clunky and doesn’t display both files at the same time. Any suggestions for suse tools to do this?
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
‘meld’ is my favorite. Available in the OpenSuSE Build Service as well so
check there (software.opensuse.org/search) and let us know.
Good luck.
mattm3a wrote:
> I’m looking for a good file merging tool. I’m merging two files that
> were previously branched. I want an output file with some changes from
> the first file and some changes from the second file.
>
> sdiff is the basic command line tool to do this, but I would prefer
> something that is graphical. imediff2 is also a bit clunky and doesn’t
> display both files at the same time. Any suggestions for suse tools to
> do this?
>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iQIcBAEBAgAGBQJJ06bEAAoJEF+XTK08PnB5KvYP+wSddPgZ5vyTaHWPqkWleDKJ
lGsMo8nYM9a7vioZmoir9RYlV2mJvlLrC+ySdDzgIlRDQw1HdRBLgBvf8ATFmQeJ
YJv6BpvxGFq5BmBjHOqnh4STUp9CTmFF0fXqDFsb7Vm59v2mG/B2dar0yAQX42p2
4bOG81dLaolEIZpedyiiKZi8fjqxgpDvTefCGIHpDwxNA1qlkLzr9ZNg6vUu+swE
ZM/miD/jMdBdNOzn/iRBQnm34OQssKX2ldyH4toOQtAD9C2KLe+++PrjPu2AJTTC
bkiQYfNjCM/BiINu3lsG0WNBEjAX4LiUuNGmb5mGWucmdavjJLZT5rf4R6Dk44sQ
XfoayYR7604jbAU4Y2Hdo41T2wnX0HAtPwbnAiLyZw1oz3jA8YqhV3k3H+8LKURl
YDrRHbL7bTY1tnFFmpc52wjqpfsKcGkN7OyCeA/p/NYpVGqLPhqNHhYEES5QObVp
Xj4r1VJzBxyIccRWC/Gtw8TrprANtliqdhG0A4Jr8Y8dcFhZvGRc59rkDzJl8yX4
Ce+5BHBPFZW+PbOvyXicWo2sc7cW0IxKmFS7UAXShs+En3PS2mAGLvv9AJmvugL0
nH/sPopCnSKWuVyv9eg1C6xCx+jc0S/3gPBnCBEvF7WZSS938ObZqqpNIqfoFtXF
bQ0b1LnNmyL49l9jeRz/
=lWET
-----END PGP SIGNATURE-----
kdiff3 worked fine for me.
Thanks for the pointers. I’ll try these out.