|
From: | Daniel J Sebald |
Subject: | Re: Mercurial tools |
Date: | Sun, 02 Feb 2014 02:25:19 -0600 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Thunderbird/3.1.16 |
On 01/28/2014 12:01 AM, Daniel J Sebald wrote:
On 01/27/2014 12:54 PM, Jordi GutiƩrrez Hermoso wrote:
2) Ability to selectively leave code hunks out of changeset.The record and crecord extensions can also achieve the same effect in a CLI or curses interface. The record extension is shipped with hg, but crecord is in an external repo. I use them both frequently for picking apart commits.I wasn't aware of crecord: https://bitbucket.org/edgimar/crecord/wiki/Home but it's basically the same thing.
Linux comes with Meld as the default merge tool. Meld looks fairly good on first inspection. It's in a bit of a state like Octave, though. Meld in Linux is good, Windows a bit dodgy and OS X requires unique build steps.
Dan
[Prev in Thread] | Current Thread | [Next in Thread] |