| commit | 0b43f50bc7d4b1f93dcbf8828ff318443638bf0c | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 10 Nov 2008 22:25:31 +0000 (10 23:25 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 7 Feb 2010 21:29:32 +0000 (7 22:29 +0100) | ||
| tree | e312a1da921e19fb07f86271b964bf57b1902ebf | treesnapshot (tar.gz zip) |
| parent | 25cd5b557575d8cf6eb5b92f866c8a34f010d622 | commitdiff |
merge-recursive: fail gracefully with directory/submodule conflicts
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| merge-recursive.c | diffblobblamehistory | |
| t/t7404-submodule-tree.sh | diffblobblamehistory |