From: Simon Ruderich <simon@ruderich.com>
Date: Fri, 29 Aug 2008 19:12:42 +0000 (+0200)
Subject: Use Apple's FileMerge for merge conflicts.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=3bd5dc94578c1c1026670024602d70f024501a53;p=config%2Fdotfiles.git

Use Apple's FileMerge for merge conflicts.
---

diff --git a/hgrc b/hgrc
index 79c2086..20d15cf 100644
--- a/hgrc
+++ b/hgrc
@@ -4,6 +4,8 @@
 [ui]
 username = Simon Ruderich <simon@ruderich.com>
 ignore = ~/.hgignore
+# Use Apple's FileMerge for merge conflicts.
+merge = opendiff-merge
 
 # Use git diffs with support for renames, binaries, access rights, etc.
 [diff]