summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-10-18 22:08:58 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-10-18 22:08:58 -0700
commit9100c9dce166318d6962b9e6a498bd4dcecdacf4 (patch)
tree1cb3ee55500e161be882994413d08b01a901390c /git-merge-resolve.sh
parentMerge early part of branch 'jc/diff-apply-patch' (diff)
parentteach revision walker about --all-match. (diff)
downloadtgif-9100c9dce166318d6962b9e6a498bd4dcecdacf4.tar.xz
Merge branch 'jc/grep'
* jc/grep: teach revision walker about --all-match. grep --all-match
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions