svn rev #21518: trunk/ doc/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21518
Commit By: tlyu
Log Message:
another diff test 3



Changed Files:
_U  trunk/
U   trunk/doc/testdiff.txt

Modified: trunk/doc/testdiff.txt
===================================================================
--- trunk/doc/testdiff.txt	2008-12-17 20:37:15 UTC (rev 21517)
+++ trunk/doc/testdiff.txt	2008-12-17 20:39:59 UTC (rev 21518)
@@ -1,7 +1,7 @@
 testing
 foo
-bar
 baz
 
 more
 here
+or something

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 122d7f7f-0217-0410-a6d0-d37b9a318acc:/local/krb5/trunk:22380
304ed8f4-7412-0410-a0db-8249d8f37659:/my-branches/kdb-config:339
7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/1ac:533
7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/advisory:1726
7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/misc:1927
7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/sprintf:936
dc483132-0cff-0310-8789-dd5450dbe970:/branches/ccapi:18199
dc483132-0cff-0310-8789-dd5450dbe970:/branches/referrals/trunk:18581
f228080b-b206-47c0-aedc-518b743a947e:/krb5/dev/coverity:18
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/asn1:1187
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/asn1-encode-tests:1181
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/ldap-patches-080218:908
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/threads-no-debug:832
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/walk-rtree:767
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/warnings:837
   + 122d7f7f-0217-0410-a6d0-d37b9a318acc:/local/krb5/trunk:22383
304ed8f4-7412-0410-a0db-8249d8f37659:/my-branches/kdb-config:339
7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/1ac:533
7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/advisory:1726
7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/misc:1927
7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/sprintf:936
dc483132-0cff-0310-8789-dd5450dbe970:/branches/ccapi:18199
dc483132-0cff-0310-8789-dd5450dbe970:/branches/referrals/trunk:18581
f228080b-b206-47c0-aedc-518b743a947e:/krb5/dev/coverity:18
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/asn1:1187
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/asn1-encode-tests:1181
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/ldap-patches-080218:908
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/threads-no-debug:832
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/walk-rtree:767
f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/warnings:837