Code

Merge branch 'js/diff-ni'
authorJunio C Hamano <junkio@cox.net>
Sun, 11 Mar 2007 07:26:33 +0000 (23:26 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Mar 2007 07:26:33 +0000 (23:26 -0800)
commitcf6981d4932007555689052cbc255b911674b01c
tree780cfe523171d98ecded8e4d8509db507707e1f3
parent8509fed75d576023f5f2db8542fad102fcc62d4d
parent5bd74506cd30e897d1493639b7438c6cc80dea8e
Merge branch 'js/diff-ni'

* js/diff-ni:
  Get rid of the dependency to GNU diff in the tests
  diff --no-index: support /dev/null as filename
  diff-ni: fix the diff with standard input
  diff: support reading a file from stdin via "-"
diff-lib.c
diff.c
t/t1300-repo-config.sh
t/t5400-send-pack.sh
t/t5401-update-hooks.sh
t/t5515-fetch-merge-logic.sh
t/t9300-fast-import.sh