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 /diff-lib.c | |
| parent | Merge branch 'os/catch-rename' (diff) | |
| parent | git gui: add directly calling merge tool from configuration (diff) | |
| download | git-492550155aec3113a4d3d2232c3f259f83737478.tar.gz git-492550155aec3113a4d3d2232c3f259f83737478.zip | |
Merge branch 'tb/mergetool-from-config'
* tb/mergetool-from-config:
git gui: add directly calling merge tool from configuration
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions