diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2014-04-13 19:53:35 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2014-04-14 16:16:22 +0200 |
| commit | 6fefb7af84170fb67a7e6c8493fc00421787bb87 (patch) | |
| tree | 68c8b22d3e7653eb6c884da5a0b4c38da27ea040 /tests/diff/diff_helpers.c | |
| parent | 103b7d21226e43192cf138ecf0b98b51796ae0ed (diff) | |
| download | libgit2-6fefb7af84170fb67a7e6c8493fc00421787bb87.tar.gz | |
Capture conflict information in MERGE_MSG for revert and merge
Diffstat (limited to 'tests/diff/diff_helpers.c')
0 files changed, 0 insertions, 0 deletions