[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Using emerge as git mergetool
|
From: |
Andrea Crotti |
|
Subject: |
Re: Using emerge as git mergetool |
|
Date: |
Tue, 06 Jul 2010 12:34:03 +0200 |
|
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/23.2 (darwin) |
Andrea Crotti <andrea.crotti.0@gmail.com> writes:
>
> and it could be useful for someone else, but I don't know if it works
> until the next conflict to solve...
Ok I found a nice way to test and no, it doesn't work...still using the
same one.
I would just like to know what command I should give to get the same
thing as git mergetool -t emerge
Should be something like
--8<---------------cut here---------------start------------->8---
cmd = git-merge-diffmerge-wrapper.sh "$PWD/$LOCAL" "$PWD/$BASE"
"$PWD/$REMOTE" "$PWD/$MERGED"
--8<---------------cut here---------------end--------------->8---