6 Commits

Author	SHA1	Message	Date
Mike Farah	b11661a1be	Refactored merge - will allow more sophisticated mergin	2020-06-18 09:44:36 +10:00
Mike Farah	9de2573009	Fixed merge append arrays	2020-02-07 16:32:39 +11:00
Mike Farah	179049a535	Always allow empty	2020-02-04 14:42:08 +11:00
Mike Farah	2fa8b24272	Can merge one file	2020-02-04 14:33:35 +11:00
Mike Farah	1a4d8158ba	Removed custom value parsing logic	2020-01-20 08:42:08 +11:00
Ryan SIU	64d38e9f03	#323 Refactor the cobra command with standard structure	2020-01-15 14:02:48 +11:00