diff options
author | Johannes Sixt <j6t@kdbg.org> | 2024-11-09 14:34:50 +0100 |
---|---|---|
committer | Johannes Sixt <j6t@kdbg.org> | 2024-11-09 14:34:50 +0100 |
commit | 492550155aec3113a4d3d2232c3f259f83737478 (patch) | |
tree | eff319feb1516e936a87590822b3175c0b5a5730 /git-gui/lib/commit.tcl | |
parent | 2864e855932540c3ec6c9bf41ee3fe027d85f642 (diff) | |
parent | 8ff65c7a53144bf9f90709ff3fe47cf83f82e8eb (diff) |
Merge branch 'tb/mergetool-from-config'
* tb/mergetool-from-config:
git gui: add directly calling merge tool from configuration
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions