diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-07-11 14:18:49 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-07-11 14:18:49 +0200 |
| commit | 0dbbfbb6491a99e6e7b751888e3157e5f9097bce (patch) | |
| tree | a546bede883631d03ffc5de60d4dd7e3c99b18e1 /tests/diff/diffiter.c | |
| parent | eb5f03461fbcaa3fef8e63d1b0f7c682708fadd2 (diff) | |
| parent | 02bf955f4a03c328a76185b13e8df3622034aecd (diff) | |
| download | libgit2-0dbbfbb6491a99e6e7b751888e3157e5f9097bce.tar.gz | |
Merge pull request #2457 from ethomson/merge_fix
merge: don't open COMMIT_MSG unless we need to append conflicts
Diffstat (limited to 'tests/diff/diffiter.c')
0 files changed, 0 insertions, 0 deletions