diff options
| author | Carlos MartÃn Nieto <[email protected]> | 2019-01-02 23:58:19 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-02 23:58:19 +0100 |
| commit | e319b9427fec099fcc8986d49a61f66ae1133e0f (patch) | |
| tree | f938999c76868f128c4b9092bcc70dd917808107 /commit.go | |
| parent | 7197faee7995ed147c09649fb932dce31fab5a64 (diff) | |
| parent | 9de57cc90ef4e3d778613ad9eec35dfb9b6b21b2 (diff) | |
Merge pull request #425 from josharian/more-merge-file-flags
merge: add missing MergeFileFlag constants
Diffstat (limited to 'commit.go')
0 files changed, 0 insertions, 0 deletions