From: Caleb Cushing Date: Tue, 11 Nov 2008 17:10:08 GMT Subject: Re: force a merge conflict Message-ID: <81bfc67a0811110910ic7f3fa7u77676961b0eac118@mail.gmail.com> In-Reply-To: > If you want to be given a chance to edit the result before the merge > commit, you probably want 'git merge --no-commit'. That's the closest to what I need to do... unfortunately it's not what I need to do. Apparently I'll have to do a vimdiff outside of git since git doesn't appear to be capable of doing what I need it to do. -- Caleb Cushing