diff options
| author | Josh Bleecher Snyder <[email protected]> | 2018-01-25 16:43:27 -0800 |
|---|---|---|
| committer | Josh Bleecher Snyder <[email protected]> | 2018-01-25 16:55:42 -0800 |
| commit | 9de57cc90ef4e3d778613ad9eec35dfb9b6b21b2 (patch) | |
| tree | c205b910d6b2a1086c707e03a005e1a7b6ea494a /diff.go | |
| parent | 432a164805a43a5ee0df15f7939dc771fc8d4fbd (diff) | |
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.
Diffstat (limited to 'diff.go')
0 files changed, 0 insertions, 0 deletions