Martin Bornhold 1824a54c6d settings: Use the new 'use_rebase' argument to decide between rebase or merge.		2016-06-27 13:18:25 +02:00
..
git	settings: Add argument to select rebase as merge strategy.	2016-06-27 13:16:10 +02:00
hg	settings: Use the new 'use_rebase' argument to decide between rebase or merge.	2016-06-27 13:18:25 +02:00
svn	project: added all source files and assets	2016-05-24 15:56:53 +02:00
__init__.py	project: added all source files and assets	2016-05-24 15:56:53 +02:00
base.py	settings: Add argument to select rebase as merge strategy.	2016-06-27 13:16:10 +02:00