-
Notifications
You must be signed in to change notification settings - Fork 6
/
merge-fmt-help.txt
48 lines (33 loc) · 1.14 KB
/
merge-fmt-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
NAME
merge-fmt - Try to automatically resolve conflicts due to code
formatting
SYNOPSIS
merge-fmt [COMMAND] …
COMMANDS
mergetool [OPTION]…
git mergetool
setup-merge [--echo] [--merge-fmt-path=VAL] [--update] [OPTION]…
Register the [merge-fmt] mergetool as the default merge driver in
git
setup-mergetool [--echo] [--merge-fmt-path=VAL] [--update] [OPTION]…
Register the [merge-fmt] mergetool in git
OPTIONS
--dune=VAL
dune path
--echo
Echo all commands.
--ocamlformat=VAL
ocamlformat path
--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 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).