Currently the next release of WinMerge is developed at https://bitbucket.org/winmerge/winmerge.

WinMerge 2011 has many wonderful features. However, you will find greatly differences of source code by comparing WinMerge 2011 source and WinMerge source code. Also development direction is also different. So I think that it is difficult to merge back into one.