log mercurial/simplemerge.py @ 6179:36ab165abbe2

age author description
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: move the bulk of simplemerge into core base contrib/simplemerge@d1dc0aa0c774