Git: mergetool.

Emacs: snippet fixes for letter.
2013-01-09 00:56:00 +01:00 · 2013-01-09 00:56:00 +01:00 · 12700c1dea
parent f2feab5775
commit 12700c1dea
2 changed files with 3 additions and 1 deletions
--- a/.emacs.d/snippets/latex-mode/letter.yasnippet
+++ b/.emacs.d/snippets/latex-mode/letter.yasnippet
@ -211,7 +211,7 @@
 \en{\hfill}
 \begin{minipage}{\mpwidth}
  \edef\fullname{\firstname{} \familyname{}}
-  \pinex{\fullname}{\textbf{\fullname}}
+  \pinex{\fullname}{\textbf{\fullname}
  \vspace{0.5em}\\\\
  }
  \small\itshape%
--- a/.gitconfig
+++ b/.gitconfig
@ -9,3 +9,5 @@
 	co = checkout
 [push]
 	default = simple
+[merge]
+	tool = emerge