aboutsummaryrefslogtreecommitdiff
path: root/arm
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-21 13:59:54 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-21 13:59:54 -0700
commitb91fb518cc5c5f316ba149ceedff5ee194f44ebf (patch)
tree643ba0ef9be45e07bfa9be5f4b723351508239ca /arm
parent4041483e5a3d2010e038ec686ef1638cde659f0b (diff)
downloadgit-b91fb518cc5c5f316ba149ceedff5ee194f44ebf.tar.gz
git-b91fb518cc5c5f316ba149ceedff5ee194f44ebf.tar.xz
Revert "Make Octopus merge message a bit nicer."
This reverts 63f1aa6c72c46928f1b6959437aed4becbc42ff3 commit.
Diffstat (limited to 'arm')
0 files changed, 0 insertions, 0 deletions