meld

Meld used to work on my machine (openSuse Linux 13.1, Python 2.7.6) but after having trouble with Spyder (like it refusing to actually run any scripts), I uninstalled a large number of things, then slowly brought them back again. Since then, meld does not work anymore. I keep getting this error message > meld Cannot import: GTK+ No module named gi I was able to solve that by installing gi: > pip install gi Now the error is replaced by: > meld Cannot import: GTK+ No module named repository ... and here is a similar question where uninstalling gi apparently helped? I'm confused. I did try

Is it possible to use Meld as a merge tool when using Git Extensions on Windows? Tomasz Maj In Git Extension: Settings -> Git Config Merge tool: meld Path to mergetool: C:/Program Files (x86)/Meld/Meld.exe Merge tool command: "C:/Program Files (x86)/Meld/Meld.exe" --diff "$BASE" "$LOCAL" "$REMOTE" --output "$MERGED" Yes it is, in response to this issue . Like Thomas, the accepted answer didn't quite work for me. The merged file was not saved after meld was closed. However, Thomas's answer didn't work for me either. While the file did save, it opened in Meld with the merged markup. Instead, I'm

I set up some git filters in order to preprocess certain files (in my case IPython Notebooks) before committing them. To be more exact I'm following these instructions: https://stackoverflow.com/a/20844506/578770 This works fine and the files are correctly filtered if I commit my changes or if I review the change using the command line "git diff ". However, if I'm reviewing my changes using meld, the files are not filtered. I tried several way to set up meld as a diff tool for git: by calling git difftool by calling meld from a custom script But none of the solutions I've found for using meld

In my repository, if I type $ git diff some-file or $ git difftool some-file I get the in-terminal diff display. I think this should not happen, because I have set up an external diff tool, as shown by the output of git config -l : $ git config -l user.name=blah blah user.email=blah blah http.sslverify=true diff.external=/home/daniel/bin/git-diff <--This is the important line push.default=simple core.filemode=false core.editor=gedit alias.tree=log --all --graph --decorate=short --color --format=format:'%C(bold blue)%h%C(reset) %C(auto)%d%C(reset) %C(black)[%cr]%C(reset) %x09%C(black)%an: %s %C

I have changed several files in a git repository, but have not committed them yet. I can get a list of the changes by just invoking git status . But how do I get a listing of the lines or the content that I have changed, in addition to the filenames? I initially thought about using git diff , but it seems to be useful only for comparing already commited changes. Usually I just do meld . , but on this case I'm connected to an external server via ssh. Mischa Arefiev git diff by default shows difference between your working directory and the index ( staging area for the next commit). If you have

Has anyone ever made Meld work with Git on Windows? I am trying to make it work and I have no success. I have Meld installed and when I call it from the command line with two files as parameters it diffs them well so Meld is installed correctly. However I can't make it work with Git (Git Diff). I use version git version 1.8.1.msysgit.1 of Git. I have tried several things: I created a shell script, meld.sh : #!/bin/bash meld.exe "$2" "$5" echo $2 echo $5 and used it from Git: [diff] tool = meld [difftool "meld"] cmd = \"D:\\meld.sh\" I tried to add it as a difftool like this: [diff] tool = meld