Solaris filemerge and pstack equivalents for linux
Taking the possibility of extreme ridicule, I have to admit that I really miss the Teamware filemerge sun. I switched from Solaris to red hat linux and found that I was regularly missing filemerge (not to be confused with Apple's tool of the same name) as well as the Solaris version of pstack (which worked with both core files and pids).
Do any experts have any consolation tips? Better fusion tools that include a pedigree? One line way to view the call stack of the main file?
Please, help!
+1
source to share
3 answers
I am using kdiff3 instead of filemerge. kdiff3 can resolve conflicts much better than filemerge.
Using:
kdiff3 x.A.cpp x.C.cpp x.P.cpp -o x.M.cpp
Where:
x.A.cpp - ancestor version of x.cpp
x.C.cpp - child verion of x.cpp
x.P.cpp - parent version of x.cpp
x.M.cpp - merged file
These files are created after running the permission command.
+1
source to share