4 commits

Author	SHA1	Message	Date
Alfredo Sumaran	197ac5ebbf	Ability to resolve conflicts for files with text-editor as conflict type	2016-10-13 14:16:35 -05:00
Alfredo Sumaran	a8ac9089af	Refactor JS code ... - Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed	2016-10-13 14:16:35 -05:00
Alfredo Sumaran	a3eb39a106	Replace textarea with Ace editor	2016-10-13 14:16:34 -05:00
Alfredo Sumaran	26f658decd	Implement editor to manually resolve merge conflicts	2016-10-13 14:16:34 -05:00