summaryrefslogtreecommitdiff
path: root/conflict.mdwn
AgeCommit message (Collapse)AuthorFilesLines
2021-04-12rename chapter titlesLars Wirzenius1-1/+1
2021-02-23language fixesLars Wirzenius1-25/+24
2018-06-13Please drop or squash this commit.Thomas Hochstein1-1/+1
"there are ... cars", I think, or is "there is ... cars" a figure of speech that I don't know yet?
2018-06-13Please drop or squash this commit.Thomas Hochstein1-1/+1
"Everything" sounds more natural/correct in my ear.
2018-06-13Please drop or squash this commit.Thomas Hochstein1-1/+1
"to handle this entirely privately" or "to handle this entirely in private", I think.
2018-06-13Assorted spelling and language adjustments.Thomas Hochstein1-8/+8
Signed-off-by: Thomas Hochstein <thh@inter.net>
2018-06-09Fix: case of letter in conflict.mdwnLars Wirzenius1-1/+1
2017-03-21Typo fixes from Pete FLars Wirzenius1-4/+4
2017-03-01Add chapter 3 (conflict)Lars Wirzenius1-0/+505