Mercurial > hg > smallbox

changeset 96:dd99d900006c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modification to box.m
author Mehrdad <myvaigha@staffmail.ed.ac.uk>
date Tue, 12 Apr 2011 15:45:19 +0100
parents 51aa5a4932b0
children 3cf9714f6883
files box.m
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/box.m	Tue Apr 12 15:42:27 2011 +0100
+++ b/box.m	Tue Apr 12 15:45:19 2011 +0100
@@ -1,1 +1,2 @@
-%% The rice mdwt crashed on my matlab session runing on linux 64!!!
\ No newline at end of file
+%% The rice mdwt crashed on my matlab session runing on linux 64!!!
+% problem with hg merge using EasyMercurial. (This is a test)
\ No newline at end of file