André Cruz 79522194f1 Inform the user when a conflict was resolved with a configured resolution.

2013-06-06 01:05:55 +01:00

..

commands

Add conflict resolve, presenting choices to the user.

2013-06-05 00:50:23 +01:00

core

Inform the user when a conflict was resolved with a configured resolution.

2013-06-06 01:05:55 +01:00

renderers

Inform the user when a conflict was resolved with a configured resolution.

2013-06-06 01:05:55 +01:00

util

Add conflict resolve, presenting choices to the user.

2013-06-05 00:50:23 +01:00

config.js

Implement the uninstall command.

2013-05-30 21:57:05 +01:00

index.js

Huge commit.

2013-05-27 22:59:13 +01:00