From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 25 Sep 2008 16:49:19 +0000 (-0700)
Subject: Merge branch 'mv/merge-recursive'
X-Git-Tag: v1.6.1-rc1~202
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ed520a8f270253f4a779aece1352b10fb9a689de

Merge branch 'mv/merge-recursive'

* mv/merge-recursive:
builtin-merge: release the lockfile in try_merge_strategy()
merge-recursive: get rid of virtual_id
merge-recursive: move current_{file,directory}_set to struct merge_options
merge-recursive: move the global obuf to struct merge_options
merge-recursive: get rid of the index_only global variable
merge-recursive: move call_depth to struct merge_options
cherry-pick/revert: make direct internal call to merge_tree()
builtin-merge: avoid run_command_v_opt() for recursive and subtree
merge-recursive: introduce merge_options
merge-recursive.c: Add more generic merge_recursive_generic()
Split out merge_recursive() to merge-recursive.c
---

ed520a8f270253f4a779aece1352b10fb9a689de