]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2864e85 8ff65c7)
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)
* tb/mergetool-from-config:
  git gui: add directly calling merge tool from configuration


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.