]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'tb/mergetool-from-config'
authorJohannes Sixt <j6t@kdbg.org>
Sat, 9 Nov 2024 13:34:50 +0000 (14:34 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Sat, 9 Nov 2024 13:34:50 +0000 (14:34 +0100)
commit492550155aec3113a4d3d2232c3f259f83737478
treeeff319feb1516e936a87590822b3175c0b5a5730
parent2864e855932540c3ec6c9bf41ee3fe027d85f642
parent8ff65c7a53144bf9f90709ff3fe47cf83f82e8eb
Merge branch 'tb/mergetool-from-config'

* tb/mergetool-from-config:
  git gui: add directly calling merge tool from configuration