Commits

Breadcrumbs

History for

onmaint

User selector

All users

All time

Commit History

Commits on Sep 17, 2020

• mergetool: allow auto-merge for meld to follow the vim-diff behavior

  Show description for dbd8c09
  

  Lin Sun

  authored and

  gitster

  committed
  dbd8c09

  Copy full SHA for dbd8c09

Commits on Jun 19, 2017

• mergetools/meld: improve compatibiilty with Meld on macOS X

  Show description for 0af85f8
  

  davvid

  authored and

  gitster

  committed
  0af85f8

  Copy full SHA for 0af85f8

Commits on Nov 29, 2016

• mergetool: honor mergetool.$tool.trustExitCode for built-in tools

  Show description for 7c10605
  

  davvid

  authored and

  gitster

  committed
  7c10605

  Copy full SHA for 7c10605

Commits on Oct 16, 2014

• mergetools/meld: make usage of `--output` configurable and more robust

  Show description for b12d045
  

  davvid

  authored and

  gitster

  committed
  b12d045

  Copy full SHA for b12d045

Commits on Feb 10, 2012

• mergetools/meld: Use --help output to detect --output support

  Show description for 759a904
  

  jrn

  authored and

  gitster

  committed
  759a904

  Copy full SHA for 759a904

Commits on Aug 19, 2011

• mergetools/meld: Use '--output' when available

  Show description for f61bd9c
  

  davvid

  authored and

  gitster

  committed
  f61bd9c

  Copy full SHA for f61bd9c

• mergetool--lib: Refactor tools into separate files

  Show description for bc7a96a
  

  davvid

  authored and

  gitster

  committed
  bc7a96a

  Copy full SHA for bc7a96a

Loading