comparison tests/test-merge1.t @ 16459:baa06fb69ece stable

merge default into stable for 2.2 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Apr 2012 17:56:36 -0500
parents 44fa047cef57
children f2719b387380
comparison
equal deleted inserted replaced
16450:c9c8c9053119 16459:baa06fb69ece