diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-30 16:36:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-30 16:36:39 -0400 |
| commit | fe72473188546d8b314d2a085f4535819ab590dc (patch) | |
| tree | ba43d77aa175041db38537a29f6ea27061597659 /configure.hs | |
| parent | b42423ddcc88ac6af9ae0ede1a58807410529f84 (diff) | |
add test: conflict resolution (mixed locked and unlocked file)
Diffstat (limited to 'configure.hs')
0 files changed, 0 insertions, 0 deletions