summaryrefslogtreecommitdiff
path: root/src/merge_file.h
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-01-20 14:12:41 -0800
committerVicent Marti <vicent@github.com>2014-01-20 14:12:41 -0800
commite49c98e6efaa444ed73ac3b8318a693801f93184 (patch)
treea6c270f95f21d4d42ea4a2543a45f00656e07afe /src/merge_file.h
parentd62bf0bf83df307b81affbf7b576985392203fad (diff)
parentb554ca5dc1b95234589367eda269a94bdda3d6ae (diff)
downloadlibgit2-e49c98e6efaa444ed73ac3b8318a693801f93184.tar.gz
Merge pull request #2065 from ethomson/submodule_unmodified
"Uninitialized" submodules are "unmodified"
Diffstat (limited to 'src/merge_file.h')
0 files changed, 0 insertions, 0 deletions