index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t3309-notes-merge-auto-resolve.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2010-11-17
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Johan Herland
1
-0
/
+502
Johan Herland