Merge branch 'jc/combined'
authorJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 08:18:55 +0000 (01:18 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 08:18:55 +0000 (01:18 -0700)
* jc/combined:
  combine-diff: a few more finishing touches.
  Documentation: clarify refname disambiguation rules.
  diff-format.txt: Combined diff format documentation supplement
  Remove --syslog in git-daemon inetd documentation examples.
  Documentation: updates to "Everyday GIT"

1  2 
combine-diff.c

diff --cc combine-diff.c
Simple merge