merge-tree: lose unused "resolve_directories"
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Dec 2012 23:53:41 +0000 (15:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Dec 2012 22:45:12 +0000 (14:45 -0800)
commit3b8ff51b708e52e4ae2b8f266d25c187c3152820
tree6f26deb45ad737a1926bf7f7b7fcbf79187ba2d8
parentb13112fa160f44fb0d795cdd992015c9f5a3d72a
merge-tree: lose unused "resolve_directories"

This option is always set; simplify.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-tree.c