summaryrefslogtreecommitdiffstats
path: root/git-mergetool--lib.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2017-10-06sha1_file: do not leak `lock_file`Martin Ă…gren1-11/+8
2017-09-29The eleventh batch for 2.15Junio C Hamano1-0/+18
2017-09-28The tenth batch for 2.15Junio C Hamano1-0/+47