diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-20 15:51:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-20 16:28:22 -0400 |
| commit | 9f31e14cc4154d2cb12a62eaf935a0c1528c709a (patch) | |
| tree | 4770fa230772931baba3cf6fcbf812205363b272 /Annex | |
| parent | 55b266130ca7dbfdc6316edf61a525683ecaa937 (diff) | |
add a test case for merge conflict automatic resolution
Diffstat (limited to 'Annex')
0 files changed, 0 insertions, 0 deletions