Stack Overflow
Stack Overflow

Questions tagged [meld]

Graphical application for Linux and other OSes used for viewing and merging differences between files and directories.

Meld is a graphical application used for viewing and merging differences between files and directories. Some of its features are:

  • two and three way merging;
  • ability to handle several text encodings;
  • basic integration with version control systems;
  • available for Linux and also for Mac OS X and Windows (albeit with some limitations).

This tag should be used for questions about the use of Meld on its own or with other tools (like ).

Related tags:

210 questions
0
votes
1 answer

why do meld shows all files in my git branch as unversioned?

I have freshly, locally cloned git branch. When I start meld and choose "version control view" it unfortunately shows all my files, including ".git" with all its contents, as unversioned. Why does it happen? The OS is windows 7.
ardabro
  • 1,907
  • 16
  • 31
0
votes
1 answer

Creating a wrapper over an open source diff tool

I want to write a wrapper over some open source diff tool. Say kdiff3. Suggesting the way to do the same. The diff tool shows as per file what is the diff in the code. I want it to perform specific task as per my requirement and automatically…
PKSA
  • 113
  • 1
  • 7
0
votes
1 answer

Need a UI tool to compare 2 linux folders from a windows server

Need a UI tool to compare 2 linux folders (from 2 different servers) from a third windows server. something like beyondCompare or meld that I can visually explore the folders of remote linux servers. Thanks.
Shahar Hamuzim Rajuan
  • 5,610
  • 9
  • 53
  • 91
0
votes
1 answer

Combining 2 patch files that patch a number of files in a directory + resolving conflicts

I have a dir with thousands of files and 2 patch files that apply to the same dir. Each patch file patches 20-30 files in dir or it's subdirs. If I apply either patch to the common ancestor dir, it succeeds. But if I apply one patch file followed…
Madiyaan Damha
  • 53
  • 2
  • 4
0
votes
1 answer

How to properly push to a repository with a newer revision number?

Please help. I'm always having a difficulty with pushing my changes to an existing remote repository where the revision number is newer. i.e. someone has pushed to that repository after I last pull. I'm using ubuntu 14.04, and netbeans and mercurial…
migs
  • 289
  • 5
  • 14
0
votes
2 answers

Git: Manually merge between stashed to current version?

While working on a feature I stashed my changes at times, when I thought there is a lot things done. Now I realised I need some code that I implemented, stashed, then removed and stashed again. So I currently don't have it, but I have it in one of…
rightaway717
  • 2,631
  • 3
  • 29
  • 43
0
votes
1 answer

Mercurial: Meld launching issues in Mac OS X and Meld not detected in Mercurial

I installed meld using Macports following the instructions in here. I even installed XQuartz as well. Problem is: every time I tried to launch meld from command line, I received a bunch of errors warning messages below, and somehow the meld window…
mynameisJEFF
  • 4,073
  • 9
  • 50
  • 96
0
votes
1 answer

how to set the default external diff in git

I changed my git's external diff to meld. I didn't like it. How can I get back to my original state? As a side question, I didn't like meld because it refused to open tabs for multiple file comparisons. To view changes in different files, meld would…
rahman
  • 4,820
  • 16
  • 52
  • 86
0
votes
1 answer

Git merge using KDiff3 and Meld?

I have configured KDiff3 as my default merge tool in the Git configuration so that when there is a merge conflict and on using the command git mergetool KDiff3 opens as my merge editor. I would like to try Git merge through meld from the command…
Ravi
  • 3,132
  • 5
  • 24
  • 35
0
votes
1 answer

install meld on mac lion with macport

i have succesfully installed meld with macport but after launch meld says: Last login: Tue Aug 27 21:28:07 on ttys001 /opt/local/bin/meld ; exit; iMac-di-Eros:~ Eros$ /opt/local/bin/meld ; exit; Couldn't bind the translation domain. Some…
sefiroths
  • 1,555
  • 3
  • 14
  • 29
0
votes
1 answer

Git - How to save diff to file when diff.external tool is configured?

I've configured my git to use Meld as the diff tool: git config --global diff.external /home/myname/diff.py When I'm trying to save a diff to a file by: git diff > file.diff Meld is opened and the diff is not saved. How can I save the diff to a…
Roy Tsabari
  • 2,000
  • 6
  • 26
  • 41
0
votes
1 answer

Merging - can I change what is recognised as similar

Is it possible to control how merge tools recognise similar blocks of code? Particularly meld, but any suggestions of alternative tools also welcome. If it is relevant, I am using mercurial. I am working on a system which has a code generator…
asc99c
  • 3,815
  • 3
  • 31
  • 54
-1
votes
1 answer

Merge two branches by using code from both of them

I have two branches master and i1: Branch master: int main() { std::cout << "Hello World!"; std::cout << "1"; std::cout << "3"; std::cout << "5"; return 0; } Branch i1: int main() { std::cout << "Hello World!"; std::cout…
vico
  • 17,051
  • 45
  • 159
  • 315
-2
votes
1 answer

A commit introduced breaking changes across many submodules. What is a visual tool I can use to compare previous commits in all submodules?

When commits introduce breaking changes across many submodules, after I restore to a working state, I'm yet to figure out the best process and visual tool to diff an entire tree and submodules to introduce fixes, and I'd like to find out how to…
openCivilisation
  • 796
  • 1
  • 8
  • 25
-2
votes
1 answer

how can i get meld woking with git extensions on windows?

I've already set up meld on git extensions like this - meld config in git extensions. But when I try to see the file diff, I get this error - error of git extensions diff. So I install gtk+ following steps on…
white john
  • 11
  • 2
1 2 3
…
13
14