From 12700c1dea490ad218b87992802d1eeca03d18cd Mon Sep 17 00:00:00 2001
From: Ambrevar <ambrevar@gmail.com>
Date: Wed, 9 Jan 2013 00:56:00 +0100
Subject: [PATCH] Git: mergetool. Emacs: snippet fixes for letter.

---
 .emacs.d/snippets/latex-mode/letter.yasnippet | 2 +-
 .gitconfig                                    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.emacs.d/snippets/latex-mode/letter.yasnippet b/.emacs.d/snippets/latex-mode/letter.yasnippet
index e9431a41..9c6f6758 100644
--- 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%
diff --git a/.gitconfig b/.gitconfig
index 282c2102..7a36f85d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -9,3 +9,5 @@
 	co = checkout
 [push]
 	default = simple
+[merge]
+	tool = emerge