Skip to content

Commit

Permalink
Merge pull request #160 from oliver-dvorski/patch-1
Browse files Browse the repository at this point in the history
fix typo in readme
  • Loading branch information
AndreasSko committed Jul 10, 2024
2 parents 0f3d56e + 617b7ed commit e228e49
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 @@ -48,7 +48,7 @@ You can enable these solvers with the `--bookmarks`, `--markings`,
`--notes`, and `--inputFields` flags:

```shell
go-jwlm merge <left-backup> <right-backup> <merged-backup> --bookmarks chooseLeft --markings chooseRight --notes chooseNewest --inputFields chooseLef
go-jwlm merge <left-backup> <right-backup> <merged-backup> --bookmarks chooseLeft --markings chooseRight --notes chooseNewest --inputFields chooseLeft
```

The conflict resolvers are helpful for regular merging when you are
Expand Down

0 comments on commit e228e49

Please sign in to comment.