aboutsummaryrefslogtreecommitdiffstats
BranchCommit messageAuthorAge
masterFix support for CRLF line endings (which git may actually produce on conflict marker lines)Mattias Andrée3 weeks
 
TagDownloadAuthorAge
1.0.4git-rediff-1.0.4.tar.gz  git-rediff-1.0.4.tar.bz2  git-rediff-1.0.4.tar.xz  Mattias Andrée3 weeks
1.0.3git-rediff-1.0.3.tar.gz  git-rediff-1.0.3.tar.bz2  git-rediff-1.0.3.tar.xz  Mattias Andrée5 weeks
1.0.2git-rediff-1.0.2.tar.gz  git-rediff-1.0.2.tar.bz2  git-rediff-1.0.2.tar.xz  Mattias Andrée3 months
1.0.1git-rediff-1.0.1.tar.gz  git-rediff-1.0.1.tar.bz2  git-rediff-1.0.1.tar.xz  Mattias Andrée4 months
1.0git-rediff-1.0.tar.gz  git-rediff-1.0.tar.bz2  git-rediff-1.0.tar.xz  Mattias Andrée4 months
 
AgeCommit messageAuthorFilesLines
2024-11-27Fix support for CRLF line endings (which git may actually produce on conflict marker lines)HEAD1.0.4masterMattias Andrée1-1/+1
2024-11-16Use git attributes to determine conflict marker size1.0.3Mattias Andrée1-11/+103
2024-10-06Update e-mailMattias Andrée1-1/+1
2024-09-13Fix segfault bug1.0.2Mattias Andrée1-1/+1
2024-08-16Fix exit value on usage error1.0.1Mattias Andrée1-1/+1
2024-08-15Fix bug1.0Mattias Andrée1-1/+2
2024-08-15Fix typoMattias Andrée2-2/+2
2024-08-15Add README and git-rediff.1Mattias Andrée3-1/+62
2024-08-15First commitMattias Andrée5-0/+734
 
Clone
git://git.maandree.se/git-rediff
https://git.maandree.se/git-rediff
ssh://$USER@maandree.se/gitrepos/git-rediff
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-21 15:04:26 +0000