diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-04 17:12:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-04 17:12:26 -0400 |
| commit | bffde12a4ee7ca5c79f18548734238829dec1cfb (patch) | |
| tree | bb1c1a751c9fc0e9b1003bec638ff92676dbba0e /Types/Group.hs | |
| parent | f29236e0d983709fb544214fe4d819657cadc915 (diff) | |
added test for conflict resolution with a file that is both deleted and modified
Diffstat (limited to 'Types/Group.hs')
0 files changed, 0 insertions, 0 deletions