summaryrefslogtreecommitdiffstats
path: root/git-merge-resolve.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2006-02-07.gitignore git-rerere and config.makAndreas Ericsson1-0/+2
2006-02-07Fix "git diff a..b" breakageLinus Torvalds1-2/+3