diff options
| author | Jason Haslam <jason@scitools.com> | 2016-02-16 21:02:41 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-05-26 01:11:34 -0500 |
| commit | afab1fff01cc4104df37531b3ddc339063a9c96a (patch) | |
| tree | d735d9b05ac96f1b17cc75bf3181d35118049e15 /tests/diff/blob.c | |
| parent | fdf14637d5ff01bb59638f8bc01ef7cf7c3324ff (diff) | |
| download | libgit2-afab1fff01cc4104df37531b3ddc339063a9c96a.tar.gz | |
checkout: handle dirty submodules correctly
Don't generate conflicts when checking out a modified submodule and the
submodule is dirty or modified in the workdir.
Diffstat (limited to 'tests/diff/blob.c')
0 files changed, 0 insertions, 0 deletions