-
Notifications
You must be signed in to change notification settings - Fork 6
/
Copy pathmerge-fmt-mergetool-help.txt
50 lines (32 loc) · 1015 Bytes
/
merge-fmt-mergetool-help.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
NAME
merge-fmt-mergetool - git mergetool
SYNOPSIS
merge-fmt mergetool [OPTION]…
OPTIONS
--base=<base-file>
--current=<current-file>
--dune=VAL
dune path
--echo
Echo all commands.
--name=<result-name>
pathname in which the merged result will be stored
-o <output-to>
--ocamlformat=VAL
ocamlformat path
--other=<other-file>
--refmt=VAL
refmt path
COMMON OPTIONS
--help[=FMT] (default=auto)
Show this help in format FMT. The value FMT must be one of auto,
pager, groff or plain. With auto, the format is pager or plain
whenever the TERM env var is dumb or undefined.
EXIT STATUS
merge-fmt mergetool exits with:
0 on success.
123 on indiscriminate errors reported on standard error.
124 on command line parsing errors.
125 on unexpected internal errors (bugs).
SEE ALSO
merge-fmt(1)