Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jn/merge-custom-no-trivial'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 3 Sep 2010 16:43:43 +0000
(09:43 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 3 Sep 2010 16:43:43 +0000
(09:43 -0700)
* jn/merge-custom-no-trivial:
t7606: Avoid using head as a file name
merge: let custom strategies intervene in trivial merges
t7606 (merge-theirs): modernize style
1
2
builtin/merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
7bdaf0b
0e1b501
)
diff --cc
builtin/merge.c
Simple merge