| commit | 3b8ff51b708e52e4ae2b8f266d25c187c3152820 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Dec 2012 23:53:41 +0000 (6 15:53 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Dec 2012 22:45:12 +0000 (26 14:45 -0800) | ||
| tree | 6f26deb45ad737a1926bf7f7b7fcbf79187ba2d8 | treesnapshot (tar.gz zip) |
| parent | b13112fa160f44fb0d795cdd992015c9f5a3d72a | commitdiff |
merge-tree: lose unused "resolve_directories"
This option is always set; simplify.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This option is always set; simplify.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge-tree.c | diffblobblamehistory |