Skip to content

jetxr/meld

This branch is up to date with yousseb/meld:master.

Folders and files

NameName
Last commit message
Last commit date

Latest commit

Nov 7, 2023
4f5cce0 · Nov 7, 2023
Nov 5, 2023
Oct 23, 2023
Jul 16, 2022
May 14, 2021
Sep 29, 2019
May 28, 2022
Jul 16, 2022
Nov 7, 2023
Jul 10, 2022
Jan 9, 2022
Feb 11, 2022
Jul 9, 2022
Mar 19, 2021
Jan 11, 2014
Nov 29, 2019
Jun 18, 2022
Oct 18, 2020
Feb 21, 2020
Jul 9, 2022
Oct 18, 2020
Jan 7, 2022
Feb 22, 2021
Apr 25, 2020
Nov 5, 2023
Dec 20, 2019
Nov 6, 2023
Aug 14, 2021

Repository files navigation

About Meld

Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and supports many version control systems including Git, Mercurial, Bazaar, CVS and Subversion.

Meld helps you review code changes, understand patches, and makes enormous merge conflicts slightly less painful.

Meld is licensed under the GPL v2 or later.

Requirements

  • Python 3.6
  • pycairo (Python3 bindings for cairo without GObject layer)
  • PyGObject 3.30 (Python3 bindings for GObject introspection)
  • gsettings-desktop-schemas

And following packages with GObject introspection:

  • GLib 2.36
  • Pango
  • PangoCairo
  • GTK+ 3.20
  • GtkSourceView 4.0

Build requirements

  • Python 3.6
  • Meson 0.48
  • Ninja
  • gettext
  • GLib 2.36 and its development utilities such as glib-compile-schemas

For Windows build requirements, see mingw-common section .gitlab-ci.yml

Running

You do not need to build Meld in order to run it. Meld can be run directly from this source directory by running:

$ bin/meld

Unix users should get Meld from their distribution package manager, or from Flathub.

Windows users should download the provided MSIs on the Meld home page.

OSX users can install Meld using Homebrew (or Macports, Fink, etc.), or there are unofficial native builds available from the Meld for OSX project.

Building

Meld uses meson build system. Use the following commands to build Meld from the source directory:

$ meson _build
$ cd _build
$ ninja

You can then install Meld system-wide by running:

$ ninja install

A Windows installer can be built with command

C:\Python34\python.exe setup_win32.py bdist_msi

which will create the file dist/Meld-VERSION-ARCH.msi.

Developing

It's easy to get started developing Meld. From a git checkout, just run bin/meld.

We also support development using Flatpak via GNOME Builder. At the Builder "Clone..." dialog, enter https://gitlab.gnome.org/GNOME/meld.git, and the default build + run development flow using Flatpak should work.

Contributing

Meld uses GNOME's GitLab to track bugs, and user questions and development discussions happen on the Meld mailing list. The development team is small, and new contributors are always welcome!

List of issues: https://gitlab.gnome.org/GNOME/meld/issues

Support forum: https://discourse.gnome.org/tag/meld

Links

Home page: http://meldmerge.org

Documentation: http://meldmerge.org/help

Wiki: https://wiki.gnome.org/Apps/Meld

Releases

No releases published

Packages

No packages published

Languages

  • Python 94.7%
  • Shell 3.4%
  • Meson 0.9%
  • Roff 0.4%
  • CSS 0.3%
  • AppleScript 0.2%
  • Makefile 0.1%