merge: add missing MergeFileFlag constants #425

Merged

josharian merged 1 commits from more-merge-file-flags into master

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

Author	SHA1	Message	Date
Josh Bleecher Snyder	9de57cc90e	merge: add missing MergeFileFlag constants 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.	2018-01-25 16:55:42 -08:00

Author

SHA1

Message

Date

Josh Bleecher Snyder

9de57cc90e

merge: add missing MergeFileFlag constants

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.

2018-01-25 16:55:42 -08:00

merge: add missing MergeFileFlag constants #425

1 Commits