Mercurial > hg
log tests/test-simplemerge.py @ 9305:1adabc0c05a2
| age | author | description |
|---|---|---|
| Thu, 06 Mar 2008 22:23:41 +0100 | Joel Rosdahl | Remove unused imports |
| Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: move the bulk of simplemerge into core |
| Tue, 19 Jun 2007 08:06:37 +0200 | Thomas Arendsen Hein | Cleanup of whitespace, indentation and line continuation. |
| Wed, 06 Jun 2007 20:22:52 +0200 | Thomas Arendsen Hein | Removed trailing whitespace and tabs from python files |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | actually port simplemerge to hg |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | Import 3-way merge code from bzr |