added git ignore matches. configured diff tools and merge tools in git

.gitconfig

@@ -38,11 +38,22 @@
  # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
  # instead of a/b/c/d as prefixes for patches
   mnemonicprefix = true
+	guitool=p4diff
+	tool=p4diff
+
+[difftool "p4diff"]
+	cmd=p4merge -db -nb Base -nl Mine-local -nr Theirs-remote  $BASE $LOCAL $REMOTE
+
 
 [merge]
-	tool = extMerge
-[merge "extMerge"]
-	cmd = 'vim -d "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
+	tool = p4merge
+
+[mergetool "p4merge"]
+	cmd = p4merge.exe -db -nb Base -nl Mine-local -nr Theirs-remote $BASE $LOCAL $REMOTE $MERGED
+
+[mergetool]
+	prompt = false
+	trustExitCode = false
 
 [advice]
   statusHints = false

.gitignore

@@ -14,7 +14,7 @@ _*
 .dbshell
 .netrc
 *.dll
-
+tags
 
 
 
@@ -32,4 +32,4 @@ Library
 Tools/vim/bundle/*
 Tools/vim/tutor/
 .config/
-./**/tags
+.lesshst

Tools/Console2/console.xml

@@ -21,7 +21,7 @@
 		</colors>
 	</console>
 	<appearance>
-		<font name="Consolas" size="10" bold="0" italic="0" smoothing="0">
+		<font name="Inconsolata for Powerline" size="10" bold="0" italic="0" smoothing="0">
 			<color use="0" r="0" g="0" b="0"/>
 		</font>
 		<window title="Console" icon="" use_tab_icon="1" use_console_title="0" show_cmd="0" show_cmd_tabs="0" use_tab_title="1" trim_tab_titles="20" trim_tab_titles_right="0"/>