From cabde9e5f150982cc7a7e3c441af77f673b4aac5 Mon Sep 17 00:00:00 2001 From: Jeremy Cook Date: Wed, 22 Mar 2017 17:23:49 -0400 Subject: [PATCH] Updated change log for new version. --- ChangeLog.markdown | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog.markdown b/ChangeLog.markdown index 1afa49e..85954b1 100644 --- a/ChangeLog.markdown +++ b/ChangeLog.markdown @@ -1,5 +1,11 @@ +#1.1.4 + * Make sure symlink conflicts are explicitly communicated to a user and symlinks are not silently overwritten + * Use real paths of symlinks when linking a castle into home + * Fix a problem when in a diff when asking a user to resolve a conflict + * Some code refactoring and fixes + #1.1.3 - * Allow a destinaton to be passed when cloning a castle + * Allow a destination to be passed when cloning a castle * Make sure `homesick edit` opens default editor in the root of the given castle * Fixed bug when diffing edited files * Fixed crashing bug when attempting to diff directories