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

[profile] / dot / bashrc

diff --git a/dot/bashrc b/dot/bashrc
index f6b7a56..37ff27c 100644 (file)
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -1,4 +1,4 @@
-### -*-sh-*-
+### -*-bash-*-
 ###
 ### Bash session things