Remove unnecessary call_depth parameter in merge-recursive.
authorShawn O. Pearce <spearce@spearce.org>
Sun, 14 Jan 2007 05:28:33 +0000 (00:28 -0500)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 Jan 2007 20:20:39 +0000 (12:20 -0800)
commit6388963...bbb47399b5ede784b1afe48679d52bb2
tree9d40d4a...e1f0765056d29e953ec4080dc74c7f6ecopy hash to clipboard (tree)
parentf4b6c6b...0fdce12d69e4ad80ff6082405ec8cfb8copy hash to clipboard (diff)
merge-recursive.c