tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Provide 'git merge --abort' as a synonym to 'git reset --merge'
[git.git]
/
t
/
t3309-notes-merge-auto-resolve.sh
2010-11-17
Johan Herland
git notes merge: Add another auto-resolving strategy...
blob
|
commitdiff
|
raw
2010-11-17
Johan Herland
git notes merge: Add automatic conflict resolvers ...
blob
|
commitdiff
|
raw
|
diff to current
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
