Allow the user to control the verbosity of merge-recursive.
authorShawn O. Pearce <spearce@spearce.org>
Sun, 14 Jan 2007 05:28:48 +0000 (00:28 -0500)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 Jan 2007 20:20:39 +0000 (12:20 -0800)
commit8c3275a...cacb83ea3f4c4f4ceb2376799fc282bd
treee19e547...8802825b6f590b67dcac6442da8d23a6copy hash to clipboard (tree)
parent6388963...bbb47399b5ede784b1afe48679d52bb2copy hash to clipboard (diff)
Documentation/config.txt
merge-recursive.c