diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-19 20:03:13 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-20 17:15:14 -0500 |
| commit | 0e1ba46cfbca0eec00d8af713fc2059158685381 (patch) | |
| tree | 3459e9cbf5ea9b399c7467cf59b48b3f8d2a8a53 /tests/diff/diffiter.c | |
| parent | 6891a862bbde86f9262c4b367effb1e29d7c513b (diff) | |
| download | libgit2-0e1ba46cfbca0eec00d8af713fc2059158685381.tar.gz | |
Remove the "merge none" flag
The "merge none" (don't automerge) flag was only to aide in
merge trivial tests. We can easily determine whether merge
trivial resulted in a trivial merge or an automerge by examining
the REUC after automerge has completed.
Diffstat (limited to 'tests/diff/diffiter.c')
0 files changed, 0 insertions, 0 deletions