[patch] 20071225-t6026-amd64-x86.diff

20071225-t6026-amd64-x86.diff (text/plain), 3.47 KB, created by Robin Johnson on 2007-12-26 03:49:20 UTC

Files t6026-trash-amd64/trash/.git/index and t6026-trash-x86/trash/.git/index differ
diff -ur t6026-trash-amd64/trash/.git/logs/HEAD t6026-trash-x86/trash/.git/logs/HEAD
--- t6026-trash-amd64/trash/.git/logs/HEAD	2007-12-25 02:20:05.000000000 -0800
+++ t6026-trash-x86/trash/.git/logs/HEAD	2007-12-25 19:29:12.000000000 -0800
@@ -2,5 +2,5 @@
 5f96ff88fbe3b71c74bcc79be069e400bf80a80d 50546102d3016f5879d1766ee1877a49169e001c C O Mitter <[e-mail]> 1112912053 -0700	commit: Master
 50546102d3016f5879d1766ee1877a49169e001c 5f96ff88fbe3b71c74bcc79be069e400bf80a80d C O Mitter <[e-mail]> 1112912053 -0700	checkout: moving from master to side
 5f96ff88fbe3b71c74bcc79be069e400bf80a80d 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <[e-mail]> 1112912113 -0700	commit: Side
-03d886186d9cafce1df533a8b9b579c8a71a1acf 0c0e14915e82f5830f6fe82f1b7deaf282d29963 C O Mitter <[e-mail]> 1112912113 -0700	merge master: Merge made by recursive.
-0c0e14915e82f5830f6fe82f1b7deaf282d29963 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <[e-mail]> 1112912113 -0700	reset --hard anchor
+03d886186d9cafce1df533a8b9b579c8a71a1acf 63ad8e9814ec35afb09a7d2da0fabbbb7b1c6a13 C O Mitter <[e-mail]> 1112912113 -0700	merge master: Merge made by recursive.
+63ad8e9814ec35afb09a7d2da0fabbbb7b1c6a13 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <[e-mail]> 1112912113 -0700	reset --hard anchor
diff -ur t6026-trash-amd64/trash/.git/logs/refs/heads/side t6026-trash-x86/trash/.git/logs/refs/heads/side
--- t6026-trash-amd64/trash/.git/logs/refs/heads/side	2007-12-25 02:20:05.000000000 -0800
+++ t6026-trash-x86/trash/.git/logs/refs/heads/side	2007-12-25 19:29:12.000000000 -0800
@@ -1,4 +1,4 @@
 0000000000000000000000000000000000000000 5f96ff88fbe3b71c74bcc79be069e400bf80a80d C O Mitter <[e-mail]> 1112911993 -0700	branch: Created from master
 5f96ff88fbe3b71c74bcc79be069e400bf80a80d 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <[e-mail]> 1112912113 -0700	commit: Side
-03d886186d9cafce1df533a8b9b579c8a71a1acf 0c0e14915e82f5830f6fe82f1b7deaf282d29963 C O Mitter <[e-mail]> 1112912113 -0700	merge master: Merge made by recursive.
-0c0e14915e82f5830f6fe82f1b7deaf282d29963 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <[e-mail]> 1112912113 -0700	reset --hard anchor
+03d886186d9cafce1df533a8b9b579c8a71a1acf 63ad8e9814ec35afb09a7d2da0fabbbb7b1c6a13 C O Mitter <[e-mail]> 1112912113 -0700	merge master: Merge made by recursive.
+63ad8e9814ec35afb09a7d2da0fabbbb7b1c6a13 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <[e-mail]> 1112912113 -0700	reset --hard anchor
Only in t6026-trash-amd64/trash/.git/objects: 0c
Only in t6026-trash-x86/trash/.git/objects: 52
Only in t6026-trash-amd64/trash/.git/objects: 59
Only in t6026-trash-x86/trash/.git/objects: 63
Only in t6026-trash-x86/trash/.git/objects: 70
Only in t6026-trash-amd64/trash/.git/objects: 85
Only in t6026-trash-amd64/trash/.git/objects: 8c
Only in t6026-trash-x86/trash/.git/objects: ad
diff -ur t6026-trash-amd64/trash/text t6026-trash-x86/trash/text
--- t6026-trash-amd64/trash/text	2007-12-25 02:20:06.000000000 -0800
+++ t6026-trash-x86/trash/text	2007-12-25 19:29:12.000000000 -0800
@@ -1,6 +1,6 @@
-orig is .merge_file_wwbLr0
-ours is .merge_file_K9DMcQ
-theirs is .merge_file_AwkOXF
+orig is .merge_file_ZRJY7N
+ours is .merge_file_a0TSIX
+theirs is .merge_file_ZGwNj7
 === orig ===
 Initial
 === ours ===