How To Configure Git To Work With DiffMerge

If you’ve reached this post by way of a search engine, I’m guessing it’s at least the fifth, sixth, or twentieth one you’ve looked at trying to understand why the hell git mergetool doesn’t launch DiffMerge. Or why git mergetool -tool-help tells you “blah blah blah The following tools are valid, but not currently available: blah blah diffmerge blah blah”. Or: “The merge tool diffmerge is not available as ‘diffmerge’”. You’ve already done everything you think you need to do in order to get DiffMerge and Git playing nicely together, right? [Read More]

Git Config Changes Not Saved When Edited With Notepad++

Turns out, closing the tab isn't enough

This is pretty stupid, but here it goes. A few minutes ago I decided to try something new: editing Git config settings with an external text editor. My default text editor is Notepad++. So I typed git config -e -global into my Git terminal window, made the changes I wanted, saved and closed the file. Well that was easy! But let’s run that command again, just to make sure it worked. [Read More]

WPF: Zoom In An Image On Application Load

I recently decided to create a new image viewer for Windows. I'm not a fan of the default Windows Photo Viewer and think most third party image viewers are even worse. The only one I've liked quite a bit is the viewer that comes bundled with Google's Picasa. However, Picasa itself no longer really fits into my digital photo organization strategy and I really hate to install all of Picasa just so I can have the peripheral 5% that constitutes its image viewer. So I decided to roll my own using WPF... [Read More]

Unit Testing HostingEnvironment.MapPath()

Without getting into all the whys and wtfs, the other day I had a need to dynamically render and inject html snippets into various webpages at runtime. The project I’m working on originally created the html in C# by concatenating string fragments and formatting them with runtime values. With all the requisite escape sequences needed to create valid html (including encapsulated JavaScript), this approach struck me as a bit messy and I decided to take a different route. [Read More]

Kindle Fire HD6: Finally, An E-Reader That’s Good For Technical Books & Articles

When I first started coding, I bought several 1,000+ page tomes that must have weighed eight pounds each. Books with that much mass do not suit my preferred reading style: leaning back, in my easy chair. They were equally inconvenient when I wanted to work though an example on my computer. Impossible to hold with one hand, I had to lie them down flat on my desk and either hover my head nearly directly above or use both hands to lift it up in order to refer back to the text. [Read More]