summaryrefslogtreecommitdiff
path: root/examples/merge.c
Commit message (Expand)AuthorAgeFilesLines
* examples: zero out our options memory before useEtienne Samson2018-01-251-0/+2
* examples: our/their can be NULLEtienne Samson2018-01-251-2/+4
* examples: fix remaining review commentsEtienne Samson2018-01-251-0/+2
* examples: move support code into static functionsEtienne Samson2018-01-251-81/+97
* examples: hoist the merge analysis back into mainEtienne Samson2018-01-251-58/+39
* examples: minor review fixupsEtienne Samson2018-01-251-10/+12
* examples: add mergeEtienne Samson2018-01-251-0/+391