Mercurial > public > mercurial-scm > hg-stable
log mercurial/simplemerge.py @ 13740:dcb51f156fa6
age | author | description |
---|---|---|
Fri, 24 Sep 2010 12:46:54 -0500 | Matt Mackall | backout most of 4f8067c94729 |
Thu, 23 Sep 2010 00:02:31 -0500 | Brodie Rao | cleanup: use x in (a, b) instead of x == a or x == b |
Thu, 26 Aug 2010 22:51:48 +0200 | Mads Kiilerich | simplemerge: remove hash-bang from non-executable script stable |