From: Joakim Verona Date: Tue, 26 Mar 2013 15:20:17 +0000 (+0100) Subject: conflict resolve X-Git-Tag: emacs-25.0.90~2939 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8;p=emacs.git conflict resolve --- 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8