technicalpickles/homesick

Incorrect diff when input [d] on collision question(homesick link)

pjw91 opened this issue · 0 comments

pjw91 commented

When resolving the collision of homesick link, the incorrect diff shows:

conflict  /home/mail6543210/.zshrc exists
Overwrite /home/mail6543210/.zshrc? (enter "h" for help) [Ynaqdh] d
--- /home/mail6543210/.zshrc    2016-01-21 18:28:15.407818483 +0800
+++ /home/mail6543210/.zshrc20160121-32166-1nweu4q  2016-01-21 18:29:40.091815017 +0800
@@ -1,126 +1 @@
-# Path to your oh-my-zsh installation.
-export ZSH=$HOME/.oh-my-zsh
-
-# Set name of the theme to load.
-# Look in ~/.oh-my-zsh/themes/
-# Optionally, if you set this to "random", it'll load a random theme each
-...(delete all file)
+/home/mail6543210/.homesick/repos/dotfiles/home/.zshrc
\ 檔案末沒有 newline 字元
Retrying...
Overwrite /home/mail6543210/.zshrc? (enter "h" for help) [Ynaqdh] q
Aborting...

Which compares the content of the old file with the path of the homesick version.