From: Jonas Flodén <jonas.floden@gmail.com>
Date: Fri, 30 Jan 2009 16:00:27 GMT
Subject: Re: [PATCH] Quick and dirty mergetool fix
Message-ID: <4983241B.6020208@gmail.com>
In-Reply-To: <1233325351-31496-1-git-send-email-charles@hashpling.org>

Hmm, with that patch I get get this instead:

mv: cannot stat `.merge_file_Yg2IIs': No such file or directory
mv: cannot stat `.merge_file_4xGT8t': No such file or directory
mv: cannot stat `.merge_file_4XAVAt': No such file or directory

Which seems to be a problem in checkout_staged_file()

The .merge_file_* files exists in the repository root (the dir with
.git) but I don't know how to fix that..

Thanks!

// Jonas