5 Commits

Author	SHA1	Message	Date
Jesse Duffield	fab194e923	better handling of merge conflicts	2018-07-21 17:48:27 +10:00
Jesse Duffield	61dcbb456d	updating doc	2018-07-21 16:00:05 +10:00
Jesse Duffield	37d9ed6712	test script to make repo with a merge conflict	2018-07-21 15:57:54 +10:00
Jesse Duffield	dd511acbdd	remove test files	2018-06-05 19:02:02 +10:00
Jesse Duffield	810bd54e68	"test"	2018-05-21 22:10:43 +10:00