Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
guilhermejccavalcanti authored Sep 23, 2024
1 parent 21595b7 commit 21c8793
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ where `leftPath`, `basePath` and `rightPath` can be either a file or a directory
| `-hnereo`, `--handle-new-element-referencing-edited-one` | 1 | Boolean | Enables or disables New Element Referencing Edited One Handler. *(default: true)*
| `-hmcrd`, `--handle-method-constructor-renaming-deletion` | 1 | Boolean | Enables or disables Method and Constructor Renaming or Deletion Handler. *(default: true)*
| `-htae`, `--handle-type-ambiguity-error` | 1 | Boolean | Enables or disables Type Ambiguity Error Handler. *(default: true)*
| `--textual-merge-strategy`, `-tms` | 1 | Boolean | Specify the merge strategy on terminal nodes. *(possible values: DIFF3, CSDIFF, CONSECUTIVE, AUTOTUNING)* *(default: diff3)*
| `--textual-merge-strategy`, `-tms` | 1 | String | Specify the merge strategy on terminal nodes. *(possible values: DIFF3, CSDIFF, CONSECUTIVE, AUTOTUNING)* *(default: diff3)*
| `--diff3-style`, `--show-base` | 1 | Boolean | Outputs the base version of the code (the common ancestor) in merge conflicts. *(default: false)*
---

Expand Down

0 comments on commit 21c8793

Please sign in to comment.