merge: add missing MergeFileFlag constants #425

2018-01-25T18:56:16-06:00

josharian commented

2018-01-25 18:56:16 -06:00

(Migrated from github.com)

While we're here, pull in comments as well.
While one can pop back and forth between godoc and libgit2 refs,
it's much nicer to have it in one place.

Note that MergeFileStyleSimplifyAlnum probably should have been called
merely MergeFileSimplifyAlnum (no "Style"). It's probably not worth
breaking backwards compatibility to fix it, but we avoid the mistake
going forwards.

While we're here, pull in comments as well. While one can pop back and forth between godoc and libgit2 refs, it's much nicer to have it in one place. Note that MergeFileStyleSimplifyAlnum probably should have been called merely MergeFileSimplifyAlnum (no "Style"). It's probably not worth breaking backwards compatibility to fix it, but we avoid the mistake going forwards.

carlosmn commented

2019-01-02 16:58:26 -06:00

(Migrated from github.com)

Thanks.

Sign in to join this conversation.

No reviewers