diff options
author | Magnus Ahltorp <map@kth.se> | 2016-03-18 16:04:40 +0100 |
---|---|---|
committer | Magnus Ahltorp <map@kth.se> | 2016-03-18 16:04:40 +0100 |
commit | 9a8f8bd8da784622fc340c8466435551a2d2d268 (patch) | |
tree | 7859c9bd160ccfd8c1c72f07daa25555ee49fc1d /test/config | |
parent | b97c5ca89ed619c1463bd9932d77f34ec59e7171 (diff) |
Added description of current merge implementation
Diffstat (limited to 'test/config')
0 files changed, 0 insertions, 0 deletions