diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2020-06-27 17:27:38 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2020-06-27 17:30:01 -0400 |
| commit | 78e626cf14762494ac2fdfa5e9758ffb10642436 (patch) | |
| tree | 75531979454e0e472d9e2d8c1df6a6ad74f5c543 /fdl-1.3.texi | |
| parent | afbeea2ac293f794456a4145e1620538d499dc11 (diff) | |
| download | piem-78e626cf14762494ac2fdfa5e9758ffb10642436.tar.gz | |
piem-am: Call git-am with --3way
I think I left this out initially with the idea that the user can (and
should) set am.threeWay to true. But I can't come up with a reason
why a caller wouldn't want to fall back to a 3-way merge [*], so pass
--3way as an explicit argument to benefit users that haven't
configured am.threeWay. Now that piem-am-args exists, a user can
always remove it if desired.
[*] And magit-am has had --3way on by default for a long time; I don't
recall any complaints.
Diffstat (limited to 'fdl-1.3.texi')
0 files changed, 0 insertions, 0 deletions