tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Try normalizing files to avoid delete/modify conflicts when merging
[git.git]
/
t
/
t6038-merge-text-auto.sh
2010-07-02
Eyvind Bernhardsen
Try normalizing files to avoid delete/modify conflicts...
blob
|
commitdiff
|
raw
2010-07-02
Eyvind Bernhardsen
Avoid conflicts when merging branches with mixed normal...
blob
|
commitdiff
|
raw
|
diff to current