From 36619adaddade973a74419fb8df8ce4f34990942 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami@samhuri.net>
Date: Sat, 19 Dec 2015 16:46:59 -0800
Subject: [PATCH] update gitconfig and lldbinit

---
 gitconfig | 3 +++
 lldbinit  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/gitconfig b/gitconfig
index afd4354..9cb21d7 100644
--- a/gitconfig
+++ b/gitconfig
@@ -50,3 +50,6 @@
 	clean = git hawser clean %f
 	smudge = git hawser smudge %f
 	required = true
+[merge "mergepbx"]
+    name = XCode project files merger
+    driver = mergepbx %O %A %B
\ No newline at end of file
diff --git a/lldbinit b/lldbinit
index 8cb9dff..308cdc8 100644
--- a/lldbinit
+++ b/lldbinit
@@ -3,3 +3,4 @@ command alias online expr [[FakeOffline sharedInstance] goOnline]
 command alias uikit expr @import UIKit
 command alias foundation expr @import Foundation
 command regex rd 's/^[[:space:]]*$/po [[[UIApplication sharedApplication] keyWindow] recursiveDescription]/' 's/^(.+)$/po [%1 recursiveDescription]/'
+command alias altrace po [[UIWindow keyWindow] _autolayoutTrace]
\ No newline at end of file