Skip to content

Commit 23242a6

Browse files
gitstergitster
committed
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
* jc/maint-mergetool-style-fix: mergetool: style fixes
2 parents ee7a83f + f8750a0 commit 23242a6

File tree

1 file changed

+308
-273
lines changed

1 file changed

+308
-273
lines changed

0 commit comments

Comments
 (0)