Changes between Version 32 and Version 33 of DeveloperGuidelines/Git
- Timestamp:
- 02/09/12 13:15:06 (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DeveloperGuidelines/Git
v32 v33 109 109 }}} 110 110 111 An alternative to diffmerge is Perforce's free P4V: 112 * http://danlimerick.wordpress.com/2011/06/19/git-for-window-tip-use-p4merge-as-mergetool/ 111 113 === Windows === 112 114 Install [http://sourceforge.net/projects/console/ Console] & [http://www.sourcegear.com/diffmerge/downloads.php Diffmerge] & [http://markembling.info/2009/09/my-ideal-powershell-prompt-with-git-integration configure Powershell].