diff options
| author | Magnus Ahltorp <map@kth.se> | 2014-10-20 14:33:41 +0200 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2014-10-24 14:41:10 +0200 |
| commit | 5d02756b2daa779023e2df4d41dbbd06289e3ac9 (patch) | |
| tree | af0bd26c4a057c0638281fcdf844da8ca51c92d5 /.gitignore | |
| parent | efdfea856954e11199750c324075237e346c714a (diff) | |
Added external merging support
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions