Mercurial > hgbook
diff en/examples/tour-merge-conflict.commit.out @ 459:d4a0d7488a08
Merged jerojasro changes
author | Igor TAmara <igor@tamarapatino.org> |
---|---|
date | Sat, 25 Oct 2008 17:29:33 -0500 |
parents | 83790457e85b |
children | bc14f94e726a |
author | Igor TAmara <igor@tamarapatino.org> |
---|---|
date | Sat, 25 Oct 2008 17:29:33 -0500 |
parents | 83790457e85b |
children | bc14f94e726a |