summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-24 01:39:01 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-24 01:39:01 -0700
commita549e11cc2fee10ddf66dd98ea79f7c624eee34e (patch)
tree6be0208ec8553296a78b595348c9c78c8f2aad13 /merge-index.c
parentMerge branch 'jc/diff' (diff)
parentgitk: Let git-rev-list do the argument list parsing (diff)
downloadtgif-a549e11cc2fee10ddf66dd98ea79f7c624eee34e.tar.xz
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Let git-rev-list do the argument list parsing
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions