index
:
git-rediff
master
[Complete] Reduce partially resolved merge conflicts
Mattias Andrée <m@maandree.se>
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
t
/
null-bytes
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Add conflcit resultions strategies and interactive mode, and a lot of tests
1.1
Mattias Andrée
2 days
1
-0
/
+15