Aaron Schrab <aaron <at> schrab.com> writes: > > At 17:43 +0100 04 Nov 2011, Bernhard Nemec <nemec <at> gmx.net> wrote: > >- meld version: '1.5.0' > >- source control software type: 'Git' > >- source control software version: '1.7.4.1' > >- the output of 'git diff --relative HEAD somefile.txt' > >- patch command: 'patch -p1 -R -d /tmp/tmpt70Ez3-meld' > > > >(GNU patch is installed) > > Do you have git's diff.mnemonicprefix set to a true value? If so, this > is likely the same problem as in > > https://bugzilla.gnome.org/show_bug.cgi?id=663050 > > A patch to fix the problem is attached to that bug report. If that > isn't the problem, it may help to send the output of
As I wrote in the other thread, I can't currently run the git version, so I didn't try that patch. But > git diff --relative HEAD somefile.txt | head -n 5 $ git diff --relative HEAD Makefile | head -n 5 diff --git a/Makefile b/Makefile index 2dd6e7a..a93c6fe 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ _______________________________________________ meld-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/meld-list
