diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-09 14:22:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-09 14:22:54 -0400 |
| commit | bf8a407da11a2143dced69489bbced6faf38db03 (patch) | |
| tree | 448c867d02a9f56bbda44acf1e84f85240be3faa /Test.hs | |
| parent | b14b041bfa448dff6a486b3e04910741732b8c0e (diff) | |
mention automatic merge conflict resolution
Diffstat (limited to 'Test.hs')
0 files changed, 0 insertions, 0 deletions