| commit | 25cd5b557575d8cf6eb5b92f866c8a34f010d622 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 10 Nov 2008 22:44:41 +0000 (10 23:44 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 7 Feb 2010 21:29:32 +0000 (7 22:29 +0100) | ||
| tree | 783dc3f065b7602860ab39631d0bf880e6f0aa34 | treesnapshot (tar.gz zip) |
| parent | 586f59d95e691b2410968d0440b7bb6f5460e849 | commitdiff |
Add tests for directory/submodule and file/submodule conflicts
These fail for a large part.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These fail for a large part.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| t/t7404-submodule-tree.sh | [new file with mode: 0755] | blob |