| commit | c70aae00dcdc8c0295f38bbbda9a50bea7bf1c79 | |
| author | Marc Weber <marco-oweber@gmx.de> | |
| Sun, 3 Aug 2008 16:16:51 +0000 (3 18:16 +0200) | ||
| committer | Marc Weber <marco-oweber@gmx.de> | |
| Sun, 3 Aug 2008 16:16:51 +0000 (3 18:16 +0200) | ||
| tree | 6dd94661988424a76383959994f3e04f0713a77a | treesnapshot (tar.gz zip) |
| parent | 8f41d91f0e2c9fa399fe06994cb59144f82f9497 | commitdiff |
cleaning up unmerged files after octopus try manually
| git-test-merge | diffblobblamehistory |