Super User is a question and answer site for computer enthusiasts and power users. Join them; it only takes a minute:

Sign up
Here's how it works:
  1. Anybody can ask a question
  2. Anybody can answer
  3. The best answers are voted up and rise to the top

I'm looking for a program that can diff/merge code files, and be aware of method names.

Currently, I'm diffing two files in WinMerge - one is a class called Core_Search, the other is a class called Search (this extends Core_Search so it can inherit all the methods, then override one or two). Core_Search contains (say) 20 methods, and Search contains one of those, with the same method name, but slightly different contents.

WinMerge's diff overview looks like this: http://img864.imageshack.us/img864/1657/diff.png because it's comparing one method to the entire class, not looking to find a matching method name.

Do any diffing/merging programs offer this kind of functionality?

share|improve this question
up vote 1 down vote accepted

You could try SourceGear DiffMerge. I haven't tested it with php, but it is a really nice tool!

share|improve this answer
    
Very nice, thanks :) – Joe Jan 4 '12 at 17:28

You must log in to answer this question.

Not the answer you're looking for? Browse other questions tagged .