DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pages*: do not use config abbreviation (#12118)

Browse Source 
Co-authored-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>
This commit is contained in:
Vitor Henrique
2024-01-25 02:29:16 -03:00
committed by GitHub
parent 55a49c4ba1
commit af35564618
49 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/common/git-mergetool.md
View File

@@ -19,10 +19,10 @@
`git mergetool --no-prompt`
- Explicitly use the GUI merge tool (see the `merge.guitool` config variable):
- Explicitly use the GUI merge tool (see the `merge.guitool` configuration variable):
`git mergetool --gui`
- Explicitly use the regular merge tool (see the `merge.tool` config variable):
- Explicitly use the regular merge tool (see the `merge.tool` configuration variable):
`git mergetool --no-gui`