Commits

History for

Commits on Oct 13, 2021

mergetools/xxdiff: prevent segfaults from stopping difftool

davvid
authored and
gitster
committed
571f434

Commits on Dec 19, 2016

Merge branch 'da/mergetool-xxdiff-hotkey'
gitster
committed
a3c9887

Commits on Dec 12, 2016

mergetools: fix xxdiff hotkeys

davvid
authored and
gitster
committed
6cf5f6c

Commits on Nov 29, 2016

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

davvid
authored and
gitster
committed
7c10605

Commits on Aug 19, 2011

mergetool--lib: Refactor tools into separate files

davvid
authored and
gitster
committed
bc7a96a

Loading