Andrew's git
/
gitweb.git
/ tree
summary
|
log
|
commit
|
diff
| tree
commit
grep
author
committer
pickaxe
?
re
history
|
HEAD
Use Daniel's read-tree in the merge strategy 'resolve'.
[gitweb.git]
/
Documentation
/
technical
/
drwxr-xr-x
parent (dest: Documentation; base: 2276aa6c098a0337bc2bec49742e332bdd1b802c)
-rw-r--r--
3251
trivial-merge.txt
blob
|
history
|
raw