Mercurial > hg-stable

changeset 18876:f63035b9b38a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Apr 2013 16:37:37 -0500
parents 16b34391819d (current diff) e9662c24f946 (diff)
children 93b03a222c3e
files mercurial/merge.py
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Wed Apr 03 17:04:38 2013 -0700
+++ b/.hgsigs	Thu Apr 04 16:37:37 2013 -0500
@@ -68,3 +68,4 @@
 7511d4df752e61fe7ae4f3682e0a0008573b0402 0 iD8DBQBRFYaoywK+sNU5EO8RAuErAJoDyhXn+lptU3+AevVdwAIeNFyR2gCdHzPHyWd+JDeWCUR+pSOBi8O2ppM=
 5b7175377babacce80a6c1e12366d8032a6d4340 0 iD8DBQBRMCYgywK+sNU5EO8RAq1/AKCWKlt9ysibyQgYwoxxIOZv5J8rpwCcDSHQaaf1fFZUTnQsOePwcM2Y/Sg=
 50c922c1b5145dab8baefefb0437d363b6a6c21c 0 iD8DBQBRWnUnywK+sNU5EO8RAuQRAJwM42cJqJPeqJ0jVNdMqKMDqr4dSACeP0cRVGz1gitMuV0x8f3mrZrqc7I=
+8a7bd2dccd44ed571afe7424cd7f95594f27c092 0 iD8DBQBRXfBvywK+sNU5EO8RAn+LAKCsMmflbuXjYRxlzFwId5ptm8TZcwCdGkyLbZcASBOkzQUm/WW1qfknJHU=
--- a/.hgtags	Wed Apr 03 17:04:38 2013 -0700
+++ b/.hgtags	Thu Apr 04 16:37:37 2013 -0500
@@ -81,3 +81,4 @@
 7511d4df752e61fe7ae4f3682e0a0008573b0402 2.5.1
 5b7175377babacce80a6c1e12366d8032a6d4340 2.5.2
 50c922c1b5145dab8baefefb0437d363b6a6c21c 2.5.3
+8a7bd2dccd44ed571afe7424cd7f95594f27c092 2.5.4