Use diff3 merge conflict style setting

This will show the original lines present in a given conflict block,
which gives more context for resolving the conflict.

src/.XCompose

@@ -0,0 +1,36 @@
+# source current locale's mappings
+# on most of my systems, this is found in /usr/share/X11/locale/en_US.UTF-8/Compose
+include "%L"
+
+# non-English characters
+<Multi_key> <p> <i>                             : "π" # GREEK SMALL LETTER PI
+
+# spaces
+<Multi_key> <n> <b> <s> <p>                     : " " nobreakspace # NON-BREAKING SPACE
+<Multi_key> <space> <0>                         : "​" U200b # ZERO WIDTH SPACE
+<Multi_key> <z> <w> <s> <p>                     : "​" U200b # ZERO WIDTH SPACE
+
+# math
+<Multi_key> <3> <v> <slash>                     : "∛" U221b # CUBE ROOT
+<Multi_key> <3> <slash> <v>                     : "∛" U221b # CUBE ROOT
+<Multi_key> <4> <v> <slash>                     : "∜" U221c # FOURTH ROOT
+<Multi_key> <4> <slash> <v>                     : "∜" U221c # FOURTH ROOT
+<Multi_key> <minus> <asciitilde>                : "≂" U2242 # MINUS TILDE
+<Multi_key> <asciitilde> <minus>                : "≃" U2243 # ASYMPTOTICALLY EQUAL TO
+<Multi_key> <slash> <asciitilde> <minus>        : "≄" U2244 # NOT ASYMPTOTICALLY EQUAL TO
+<Multi_key> <exclam> <asciitilde> <minus>       : "≄" U2244 # NOT ASYMPTOTICALLY EQUAL TO
+<Multi_key> <asciitilde> <equal>                : "≅" U2245 # APPROXIMATELY EQUAL TO
+<Multi_key> <asciitilde> <slash> <equal>        : "≆" U2246 # APPROXIMATELY BUT NOT ACTUALLY EQUAL TO
+<Multi_key> <asciitilde> <exclam> <equal>       : "≆" U2246 # APPROXIMATELY BUT NOT ACTUALLY EQUAL TO
+<Multi_key> <slash> <asciitilde> <equal>        : "≇" U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO
+<Multi_key> <exclam> <asciitilde> <equal>       : "≇" U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO
+<Multi_key> <slash> <asciitilde> <asciitilde>   : "≉" U2249 # NOT ALMOST EQUAL TO
+<Multi_key> <exclam> <asciitilde> <asciitilde>  : "≉" U2249 # NOT ALMOST EQUAL TO
+<Multi_key> <exclam> <equal>                    : "≠" U2260 # NOT EQUAL TO
+# overrides X default mapping of <Multi_key> <slash> <less> : "\\"
+<Multi_key> <slash> <less>                      : "≮" U226e # NOT LESS THAN
+<Multi_key> <exclam> <less>                     : "≮" U226e # NOT LESS THAN
+<Multi_key> <slash> <greater>                   : "≯" U226f # NOT GREATER THAN
+<Multi_key> <exclam> <greater>                  : "≯" U226f # NOT GREATER THAN
+<Multi_key> <less> <asciitilde>                 : "≲" U2272 # LESS THAN OR EQUIVALENT TO
+<Multi_key> <greater> <asciitilde>              : "≳" U2273 # GREATER THAN OR EQUIVALENT TO

src/.bashrc

@@ -101,6 +101,7 @@ alias nohup='nohup >/dev/null &>/dev/null'
 
 # simple shortcuts
 alias aliases='alias -p'
+alias -- -='cd -'
 alias h='history'
 alias j='jobs -l'
 alias which='type -a'

src/.gitconfig

@@ -71,6 +71,10 @@
 	diffFilter = ((type diff-highlight >/dev/null 2>&1 && diff-highlight) || $(git config core.pager))
 [log]
 	follow = true
+[merge]
+	# TODO: Switch this to the even better "zdiff3" (zealous diff3) setting once
+	# git 2.35 is available in Debian stable
+	conflictstyle = diff3
 [notes]
 	displayRef = refs/notes/*
 [pager]