found 637355 git/1:1.7.6-1 tags 637355 + upstream forwarded 637355 http://thread.gmane.org/gmane.comp.version-control.git/179072 quit
Tanguy Ortolo wrote: > git-mergetool ideally uses tools that work with 4 files: BASE, LOCAL, > REMOTE, which are the usual original and two new version of the file, > and MERGED, which is where the tool is supposed to write the result of > the merge. > > The problem is that most tools, at least graphical ones, specifically > meld, can only work with three files [...] > git-mergetool currently handles this situation by passing MERGED LOCAL > REMOTE to the tool. This could be fine, but unfortunately MERGE contains > the conflicts, formatted for manual resolution, so it is not really > appropriate as an original file. Thanks for a clear report. Let's take this upstream. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
