From 40e9b835c0fd92b38373e2e418833f2ad38c3171 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Tue, 13 Jul 2021 19:40:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BC=D0=B5=D1=80=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ignore            |  6 +++---
 user.conf.example | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 user.conf.example

diff --git a/ignore b/ignore
index a263734..67d07d0 100644
--- a/ignore
+++ b/ignore
@@ -1,10 +1,10 @@
+!.gitkeep
+!.gitignore
+
 ###
 ### Общие настройки для C, C++, Fortran, Qt, CMake, Ninja, LaTeX и редакторов
 ###
 
-!.gitkeep
-!.gitignore
-
 ###
 ### Временные файлы текстовых редакторов
 ###
diff --git a/user.conf.example b/user.conf.example
new file mode 100644
index 0000000..bc9ff3d
--- /dev/null
+++ b/user.conf.example
@@ -0,0 +1,11 @@
+[user]
+	name         = John Doe
+	email        = john@doe.com
+
+[core]
+	editor       = mcedit
+	pager        = less -R
+
+[merge]
+	tool         = meld
+