git-rediff - [Complete] Reduce partially resolved merge conflicts

Branch	Commit message	Author	Age
master	fix doc text	Mattias Andrée	31 hours

Tag	Download	Author	Age
1.0.5	git-rediff-1.0.5.tar.gz git-rediff-1.0.5.tar.bz2 git-rediff-1.0.5.tar.xz	Mattias Andrée	25 hours
1.0.4	git-rediff-1.0.4.tar.gz git-rediff-1.0.4.tar.bz2 git-rediff-1.0.4.tar.xz	Mattias Andrée	15 months
1.0.3	git-rediff-1.0.3.tar.gz git-rediff-1.0.3.tar.bz2 git-rediff-1.0.3.tar.xz	Mattias Andrée	15 months
1.0.2	git-rediff-1.0.2.tar.gz git-rediff-1.0.2.tar.bz2 git-rediff-1.0.2.tar.xz	Mattias Andrée	17 months
1.0.1	git-rediff-1.0.1.tar.gz git-rediff-1.0.1.tar.bz2 git-rediff-1.0.1.tar.xz	Mattias Andrée	18 months
1.0	git-rediff-1.0.tar.gz git-rediff-1.0.tar.bz2 git-rediff-1.0.tar.xz	Mattias Andrée	18 months

Age	Commit message	Author	Files	Lines
31 hours	fix doc textHEAD 1.0.5 master	Mattias Andrée	2	-3/+3
2024-11-27	Fix support for CRLF line endings (which git may actually produce on conflict marker lines)1.0.4	Mattias Andrée	1	-1/+1
2024-11-16	Use git attributes to determine conflict marker size1.0.3	Mattias Andrée	1	-11/+103
2024-10-06	Update e-mail	Mattias Andrée	1	-1/+1
2024-09-13	Fix segfault bug1.0.2	Mattias Andrée	1	-1/+1
2024-08-16	Fix exit value on usage error1.0.1	Mattias Andrée	1	-1/+1
2024-08-15	Fix bug1.0	Mattias Andrée	1	-1/+2
2024-08-15	Fix typo	Mattias Andrée	2	-2/+2
2024-08-15	Add README and git-rediff.1	Mattias Andrée	3	-1/+62
2024-08-15	First commit	Mattias Andrée	5	-0/+734

Clone
git://git.maandree.se/git-rediff
https://git.maandree.se/git-rediff
ssh://$USER@maandree.se/gitrepos/git-rediff