| Thu, 30 Apr 2009 23:57:36 -0500 | Steve Borho | simplemerge: use ui.warn() for warnings | file | diff | annotate |
| Sun, 12 Oct 2008 19:11:59 +0200 | Patrick Mezard | tests: Windows compatibility fixes | file | diff | annotate |
| Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: move the bulk of simplemerge into core | file | diff | annotate |
| Tue, 07 Aug 2007 10:24:33 +0200 | Thomas Arendsen Hein | Remove trailing spaces | file | diff | annotate |
| Sun, 06 May 2007 16:40:53 +0200 | Patrick Mezard | simplemerge: flush stdout before writing to stderr. | file | diff | annotate |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | polish the simplemerge command; add a test | file | diff | annotate |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | actually port simplemerge to hg | file | diff | annotate |
| Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | Import 3-way merge code from bzr | file | diff | annotate |