Re: [PATCH] mergetool merge/skip/abort at prompt

From: Caleb Cushing <xenoterracide@gmail.com>
Date: Jan 28, 2009, 09:50 UTC
Message-ID: <81bfc67a0901280150i799c881fyf3f506d7ba3c26d6@mail.gmail.com>
In-Reply-To: <402731c90901280004l29382eaanedfdfcca75529468@mail.gmail.com>

Show 6 quoted lines

>  Also, my example has quit instead of abort for two reasons (the first
>  one is silly)
>  1. skip rhymes with quit, so it reads very nicely out loud
>  2. consistency with git add --interactive
>  3. less typos (q and s are diagonal on qwerty, s and a are adjacent)
>  (okay, that last one is silly too)

I chose abort because it's used in other places in mergetool (for same purpose). I'm not opposed to cleaning up or making it more consistent with other utilities though. but perhaps that's for another patch...

>  slightly off-topic:
>  If we're looking at cleaning up mergetool a bit would you all mind a
>  separate patch to convert it to using hard tabs throughout, just like
>  git-rebase.sh?

in an earlier thread... I complained loudly about the mixing of tabs and spaces, it should be banned imho, causes nothing but problems.

-- 
Caleb Cushing

http://xenoterracide.blogspot.com