diff options
| author | Jason Haslam <jason@scitools.com> | 2016-05-12 13:18:07 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-05-26 01:11:55 -0500 |
| commit | c864b4ab996159a2cb0905aafbccb3347560e4ac (patch) | |
| tree | b1400b10f8a9da87a9ec2ae926458be308ac9570 /src/commit.c | |
| parent | afab1fff01cc4104df37531b3ddc339063a9c96a (diff) | |
| download | libgit2-c864b4ab996159a2cb0905aafbccb3347560e4ac.tar.gz | |
Ignore submodules when checking for merge conflicts in the workdir.
Diffstat (limited to 'src/commit.c')
0 files changed, 0 insertions, 0 deletions