Search Results

Search found 11 results on 1 pages for 'diffmerge'.

Page 1/1 | 1 

• How do I view 'git diff' output with visual diff program?

  - by padraigf

  When I type 'git diff', I want to view the output with my visual diff tool of choice (SourceGear diffmerge on Windows). How do I configure git to do this?

  Read the article

• .NET "must-have" development tools

  - by nzpcmad

  James Avery wrote a classic article a while back entitled Ten Must-Have Tools Every Developer Should Download Now which is a companion to Visual Studio Add-Ins Every Developer Should Download Now and Scott Hanselman has an excellent list on his blog but if you were on a desert island and were only allowed three .NET development tools which ones…

  Read the article

• Why does the Git community seem to ignore side-by-side diffs

  - by Kyle Heironimus

  I used to use Windows, SVN, Tortoise SVN, and Beyond Compare. It was a great combination for doing code reviews. Now I use OSX and Git. I've managed to kludge together a bash script along with Gitx and DiffMerge to come up with a barely acceptable solution. I've muddled along with this setup, and similar ones, for over a year. I've also…

  Read the article

• Best graphical source code diff viewer/editor for code comparison and merging?

  - by Assaf Lavie

  The options for source code diff viewing/editing/merging seem to be: Free: Tortoise Merge Meld * WinDiff WinMerge * DiffMerge * KDiff AJC Diff Commercial: Total Commander's Diff viewer * Beyond Compare * Delta Walker * Araxis Merge * Are there any other options? (Wikipedia suggests a few) What's your favorite tools for source…

  Read the article

• Unset core.editor in Msysgit

  - by mathee

  I set my editor per an SO entry: http://stackoverflow.com/questions/780425/how-do-i-setup-diffmerge-with-msysgit-gitk. I'm wondering how to undo this because I want to switch back to the default editing program.

  Read the article

• OpenXML error “file is corrupt and cannot be opened.”

  - by nmgomes

  From time to time I ear some people saying their new web application supports data export to Excel format. So far so good … but they don’t tell the all story … in fact almost all the times what is happening is they are exporting data to a Comma-Separated file or simply exporting GridView rendered HTML to an xls file. Ok … it works but…

  Read the article

• Diff Algorithm

  - by Daniel Magliola

  I've been looking like crazy for an explanation of a diff algorithm that works and is efficient. The closest I got is this link to RFC 3284 (from several Eric Sink blog posts), which describes in perfectly understandable terms the data format in which the diff results are stored. However, it has no mention whatsoever as to how a…

  Read the article

• C# string equality operator returns false, but I'm pretty sure it should be true... What?!

  - by Daniel Schaffer

  I'm trying to write a unit test for a piece of code that generates a large amount of text. I've run into an issue where the "expected" and "actual" strings appear to be equal, but Assert.AreEqual throws, and both the equality operator and Equals() return false. The result of GetHashCode() is different for both values as well. …

  Read the article

• Software development stack 2012

  A couple of months ago, I posted on Google+ about my evaluation period for a new software development stack in general. "Analysing existing 'jungle' of multiple applications and tools in various languages for clarification and future design decisions. Great fun and lots of headaches... #DevelopersLife" Surprisingly, there was…

  Read the article

• Best Diff Tool?

  - by ila

  For all my present Diff / Merge needs I'm using Beyond Compare; when I decided to buy a license for it I tried other similar tools, both payware and freeware. Now BC is at version 3, and I think it's a great tool... but what are your experience in this field? Do you think there is something better? And what are the feature…

  Read the article

• Tools of the Trade

  - by Ajarn Mark Caldwell

  I got pretty excited a couple of days ago when my new laptop arrived. “The new phone books are here!  The new phone books are here!  I’m a somebody!” - Steve Martin in The Jerk It is a Dell Precision M4500 with an Intel i7 Core 2.8 GHZ running 64-bit Windows 7 with a 15.6” widescreen, 8 GB RAM, 256 GB…

  Read the article

1