code_junkie

solaris filemerge and pstack equivalents for linux

Nov 12th, 2011
57
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.17 KB | None | 0 0
  1. kdiff3 x.A.cpp x.C.cpp x.P.cpp -o x.M.cpp
  2.  
  3. x.A.cpp - ancestor version of x.cpp
  4. x.C.cpp - child verion of x.cpp
  5. x.P.cpp - parent version of x.cpp
  6. x.M.cpp - merged file
Add Comment
Please, Sign In to add comment