summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-06 21:47:07 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-06 21:47:07 -0700
commite04156a437e671a772187da789d6a736a8125eef (patch)
tree3e335fbf5dc5a7f0439e85f8fa60503b10d8a303 /Documentation/git-merge-index.txt
parentMerge branch 'jc/reupdate' into next (diff)
parentFix users of prefix_path() to free() only when necessary (diff)
downloadtgif-e04156a437e671a772187da789d6a736a8125eef.tar.xz
Merge branch 'jc/reupdate' into next
* jc/reupdate: Fix users of prefix_path() to free() only when necessary
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions