Mercurial Mercurial > hg / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Thu, 26 Aug 2010 17:55:07 +0200 merge with stable
changeset
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:55:07 +0200] rev 12047
merge with stable
Thu, 26 Aug 2010 17:38:43 +0200 Fix merge-tools.checkconflicts stable
changeset
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:38:43 +0200] rev 12046
Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.
Thu, 26 Aug 2010 17:38:43 +0200 Fix merge-tools.checkconflicts
changeset
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Aug 2010 17:38:43 +0200] rev 12045
Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
Mercurial