summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-28 12:23:28 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-28 12:23:28 -0700
commit5afa69b415fd020d6dd36751bdcf45fdbf07dd4a (patch)
treeb5b607987da1d965f6ce76d7fbe58f85cc0e3ac4 /git-merge-ours.sh
parentab9f30fd7538ec5385bf5a3d11117f23f4f320ee (diff)
downloadgit-5afa69b415fd020d6dd36751bdcf45fdbf07dd4a.tar.gz
t4103: fix binary patch application test.
The generated binary patch was _not_ binary -- earlier I made the --full-index flag to imply binary patch generation to the diff machinery, but later we made it independent from --binary (although the latter implies the former). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions