Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 193134 | Differences between
and this patch

Collapse All | Expand All

(-)t6026-trash-amd64/trash/.git/logs/HEAD (-2 / +2 lines)
Lines 2-6 Link Here
2 
5f96ff88fbe3b71c74bcc79be069e400bf80a80d 50546102d3016f5879d1766ee1877a49169e001c C O Mitter <committer@example.com> 1112912053 -0700	commit: Master
 2 
5f96ff88fbe3b71c74bcc79be069e400bf80a80d 50546102d3016f5879d1766ee1877a49169e001c C O Mitter <committer@example.com> 1112912053 -0700	commit: Master
3 
50546102d3016f5879d1766ee1877a49169e001c 5f96ff88fbe3b71c74bcc79be069e400bf80a80d C O Mitter <committer@example.com> 1112912053 -0700	checkout: moving from master to side
 3 
50546102d3016f5879d1766ee1877a49169e001c 5f96ff88fbe3b71c74bcc79be069e400bf80a80d C O Mitter <committer@example.com> 1112912053 -0700	checkout: moving from master to side
4 
5f96ff88fbe3b71c74bcc79be069e400bf80a80d 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <committer@example.com> 1112912113 -0700	commit: Side
 4 
5f96ff88fbe3b71c74bcc79be069e400bf80a80d 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <committer@example.com> 1112912113 -0700	commit: Side
5 
03d886186d9cafce1df533a8b9b579c8a71a1acf 0c0e14915e82f5830f6fe82f1b7deaf282d29963 C O Mitter <committer@example.com> 1112912113 -0700	merge master: Merge made by recursive.
 5 
03d886186d9cafce1df533a8b9b579c8a71a1acf 63ad8e9814ec35afb09a7d2da0fabbbb7b1c6a13 C O Mitter <committer@example.com> 1112912113 -0700	merge master: Merge made by recursive.
6 
0c0e14915e82f5830f6fe82f1b7deaf282d29963 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <committer@example.com> 1112912113 -0700	reset --hard anchor
 6 
63ad8e9814ec35afb09a7d2da0fabbbb7b1c6a13 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <committer@example.com> 1112912113 -0700	reset --hard anchor
(-)t6026-trash-amd64/trash/.git/logs/refs/heads/side (-2 / +2 lines)
Lines 1-4 Link Here
1 
0000000000000000000000000000000000000000 5f96ff88fbe3b71c74bcc79be069e400bf80a80d C O Mitter <committer@example.com> 1112911993 -0700	branch: Created from master
 1 
0000000000000000000000000000000000000000 5f96ff88fbe3b71c74bcc79be069e400bf80a80d C O Mitter <committer@example.com> 1112911993 -0700	branch: Created from master
2 
5f96ff88fbe3b71c74bcc79be069e400bf80a80d 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <committer@example.com> 1112912113 -0700	commit: Side
 2 
5f96ff88fbe3b71c74bcc79be069e400bf80a80d 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <committer@example.com> 1112912113 -0700	commit: Side
3 
03d886186d9cafce1df533a8b9b579c8a71a1acf 0c0e14915e82f5830f6fe82f1b7deaf282d29963 C O Mitter <committer@example.com> 1112912113 -0700	merge master: Merge made by recursive.
 3 
03d886186d9cafce1df533a8b9b579c8a71a1acf 63ad8e9814ec35afb09a7d2da0fabbbb7b1c6a13 C O Mitter <committer@example.com> 1112912113 -0700	merge master: Merge made by recursive.
4 
0c0e14915e82f5830f6fe82f1b7deaf282d29963 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <committer@example.com> 1112912113 -0700	reset --hard anchor
 4 
63ad8e9814ec35afb09a7d2da0fabbbb7b1c6a13 03d886186d9cafce1df533a8b9b579c8a71a1acf C O Mitter <committer@example.com> 1112912113 -0700	reset --hard anchor
(-)t6026-trash-amd64/trash/text (-3 / +3 lines)
Lines 1-6 Link Here
1 
orig is .merge_file_wwbLr0
 1 
orig is .merge_file_ZRJY7N
2 
ours is .merge_file_K9DMcQ
 2 
ours is .merge_file_a0TSIX
3 
theirs is .merge_file_AwkOXF
 3 
theirs is .merge_file_ZGwNj7
4 
=== orig ===
 4 
=== orig ===
5 
Initial
 5 
Initial
6 
=== ours ===
 6 
=== ours ===

Return to bug 193134