Mercurial > hg > xemacs-beta

changeset 5121:c6c982484f87 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manually resolve merge problem
author Ben Wing <ben@xemacs.org>
date Wed, 30 Dec 2009 04:27:30 -0600
parents d1247f3cc363
children 942c340254b3
files .hgtags
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Dec 28 01:15:52 2009 -0600
+++ b/.hgtags	Wed Dec 30 04:27:30 2009 -0600
@@ -235,9 +235,6 @@
 223736d75acb5265cfd9352497e8483d787d8eab r21-2-45
 0784d089fdc93fb58040b6efbec55cd4fdf650c2 r21-2-46
 5aa1854ad5374fa936e99e22e7b1242097292f16 r21-2-47
-<<<<<<< local
 aaf96f4ba61234a5331b280b774d357503cd7994 ben-lisp-object-bp
-=======
 1af222c7586991f690ea06d1b8c75fb5a6a0a352 r21-5-28
 5c427ece884b7023a244fba8cad8cf41b37dd5ca r21-5-29
->>>>>>> other