Mercurial > hg
log mercurial/simplemerge.py @ 10831:441f5d66da03
| age | author | description |
|---|---|---|
| Mon, 25 Jan 2010 00:05:27 -0600 | Matt Mackall | many, many trivial check-code fixups |
| Tue, 28 Apr 2009 17:40:46 +0200 | Simon Heimberg | separate import lines from mercurial and general python modules |
| Thu, 30 Apr 2009 23:57:36 -0500 | Steve Borho | simplemerge: use ui.warn() for warnings |
| Tue, 28 Oct 2008 19:25:26 +0100 | Benoit Boissinot | remove unused variables |
| 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 base contrib/simplemerge@d1dc0aa0c774 |