log

age author description
Fri, 15 Feb 2013 21:20:24 -0600 Kevin Bullock merge with stable
Fri, 15 Feb 2013 15:06:43 -0600 Kevin Bullock mergetools: refine vimdiff warning message stable
Fri, 15 Feb 2013 11:28:04 +0100 Pierre-Yves David mergetools: vimdiff issue a warning explaining how to abort stable