Commits

Breadcrumbs

History for

onmaster

User selector

All users

All time

Commit History

Commits on Jun 8, 2021

• mergetools/kdiff3: make kdiff3 work on Windows too

  Show description for 47eb4c6
  

  michaelcompressconsult

  authored and

  gitster

  committed
  47eb4c6

  Copy full SHA for 47eb4c6

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 Nov 21, 2014

• mergetools: stop setting $status in merge_cmd()

  Show description for 1e86d5b
  

  davvid

  authored and

  gitster

  committed
  1e86d5b

  Copy full SHA for 1e86d5b

Commits on May 9, 2013

• mergetools/kdiff3: do not use --auto when diffing

  Show description for e2161bc
  

  davvid

  authored and

  gitster

  committed
  e2161bc

  Copy full SHA for e2161bc

Commits on Aug 19, 2011

• mergetool--lib: Refactor tools into separate files

  Show description for bc7a96a
  

  davvid

  authored and

  gitster

  committed
  bc7a96a

  Copy full SHA for bc7a96a

Loading