Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/t6031-typofix'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 29 Sep 2014 19:36:14 +0000
(12:36 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 29 Sep 2014 19:36:14 +0000
(12:36 -0700)
* sb/t6031-typofix:
t6031-test-merge-recursive: do not forget to add file to be committed
1
2
t/t6031-merge-recursive.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
4d4dc66
8c3419b
)
diff --cc
t/t6031-merge-recursive.sh
Simple merge