diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-14 21:31:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-14 21:31:30 -0800 |
| commit | 5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1 (patch) | |
| tree | 79abb4eb4861b14908459862a792febb9123e5f7 /commit.h | |
| parent | e7eb50347bba54ab52f9740a3bbb6e833bdadf6e (diff) | |
| download | git-5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1.tar.gz git-5fe3acc43ddb30c61f0adc922f1f08ccc117d2c1.tar.xz | |
Documentation: merge-output is not too verbose now.
We've squelched output from merge-recursive, and git-merge when
used with recursive does not attempt the trivial one first
anymore, so there won't be "Trying ... Nope." messages now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions