| commit | 3ef63227416b890b799ec0ffec92859213b54f0d | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sat, 1 Oct 2016 17:13:54 +0000 (1 19:13 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sat, 1 Oct 2016 17:13:54 +0000 (1 19:13 +0200) | ||
| tree | ec2ac9a93a297628b9284970a8f2e2cee340bb53 | treesnapshot (tar.gz zip) |
| parent | eed0efa71d1c8e45b4d842f461df8947ef7866a2 | commitdiff |
| parent | faf6dbbe21eaa32ab7d286681a7062772d2c2cdd | commitdiff |
Merge branch 'warn-on-conflicts'