From cTuning.org
Navigation: cTuning.org > CTools > ICI
Code merging
- Linux: Meld (homepage) handles the complete GCC trees very well. Supports on-the-fly, visual merging of files.
- Windows: BeyondCompare (homepage) is excellent, but not free.
GIT user interfaces
A discussion of Git is available on Wikipedia.
Several graphical user interfaces are available for Git: git-gui and giggle (both are pre-packaged for all major Linux distributions). Git-gui seems much more efficient on large source trees.
On Windows git is officially supported on Cygwin, but there is another port based on MinGW called MSysGit. You can refer to this Ropiku's blog entry about installing and using git on Windows (including git-gui and gitk).
GIT tutorials
- Linus Torvalds' talk about git
- entry point: GIT crash courses