summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-26 04:32:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-26 20:36:36 (GMT)
commit8fd2cb4069178539d8cf7711586d4e6378722bf3 (patch)
tree33db684a3460e85ec2bbfd0370db0012c90320b9 /git-am.sh
parent24cf6e5847073d50390e0b7950e8e6b5a09103bc (diff)
downloadgit-8fd2cb4069178539d8cf7711586d4e6378722bf3.zip
git-8fd2cb4069178539d8cf7711586d4e6378722bf3.tar.gz
git-8fd2cb4069178539d8cf7711586d4e6378722bf3.tar.bz2
Extract helper bits from c-merge-recursive work
This backports the pieces that are not uncooked from the merge-recursive WIP we have seen earlier, to be used in git-mv rewritten in C. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions