dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.

[profile] / dot / ercrc.el

diff --git a/dot/ercrc.el b/dot/ercrc.el
index 2eeb2f1..8ccbbb8 100644 (file)
--- a/dot/ercrc.el
+++ b/dot/ercrc.el
@@ -6,8 +6,8 @@
 (setq erc-nick "mdw"
       erc-user-full-name "Mark Wooding")
 
-(setq erc-fill-column 77
-      erc-timestamp-right-column 69
+(setq erc-fill-column 76
+      erc-timestamp-right-column 68
       erc-fill-prefix "   ")
 
 (load "~/.erc-local.el")
@@ -20,8 +20,7 @@
   (setq truncate-lines nil
        truncate-partial-with-windows nil
        word-wrap t
-       wrap-prefix (concat (propertize "   >"
-                                       'face 'erc-prompt-face)
+       wrap-prefix (concat (propertize "    " 'face 'erc-prompt-face)
                            " ")))
 (add-hook 'erc-mode-hook 'mdw-erc-turn-off-truncate-lines)