# HG changeset patch # User Steve Huston # Date 1367636228 14400 # Node ID 21e0ab41e18073a82f47b5536db1444b29297843 # Parent a835f8c36e93ba673ff9f087836c1706308a74d2 Adding the record extension - very useful! diff -r a835f8c36e93 -r 21e0ab41e180 .hgrc --- a/.hgrc Wed May 01 14:08:33 2013 -0400 +++ b/.hgrc Fri May 03 22:57:08 2013 -0400 @@ -9,6 +9,7 @@ convert = keyword = color = +record = [merge-tools] vimdiff.executable = vim