git-mergetool documentaiton: show toolnames in typewriter font
Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charles Bailey committed
Mar 8, 2008 at 20:46 UTC
bbdfbc4b01b38489a0c171bc70c89e017c759cdc
1 file changed
+8
-8
Documentation/git-mergetool.txt
+8
-8
@@ -12,12 +12,12 @@ SYNOPSIS
12
DESCRIPTION
13
-----------
14
15
-Use 'git mergetool' to run one of several merge utilities to resolve
15
+Use `git mergetool` to run one of several merge utilities to resolve
16
merge conflicts. It is typically run after linkgit:git-merge[1].
17
18
If one or more <file> parameters are given, the merge tool program will
19
be run to resolve differences on each file. If no <file> names are
20
-specified, 'git mergetool' will run the merge tool program on every file
20
+specified, `git mergetool` will run the merge tool program on every file
21
with merge conflicts.
22
23
OPTIONS
@@ -27,16 +27,16 @@ OPTIONS
27
Valid merge tools are:
28
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
29
+
30
-If a merge resolution program is not specified, 'git mergetool'
31
-will use the configuration variable merge.tool. If the
32
-configuration variable merge.tool is not set, 'git mergetool'
30
+If a merge resolution program is not specified, `git mergetool`
31
+will use the configuration variable `merge.tool`. If the
32
+configuration variable `merge.tool` is not set, `git mergetool`
33
will pick a suitable default.
34
+
35
You can explicitly provide a full path to the tool by setting the
36
-configuration variable mergetool.<tool>.path. For example, you
36
+configuration variable `mergetool.<tool>.path`. For example, you
37
can configure the absolute path to kdiff3 by setting
38
-mergetool.kdiff3.path. Otherwise, 'git mergetool' assumes the tool
39
-is available in PATH.
38
+`mergetool.kdiff3.path`. Otherwise, `git mergetool` assumes the
39
+tool is available in PATH.
40
41
Author
42
------