Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/error-resolve-conflict-advice'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 16 Jun 2014 19:18:47 +0000
(12:18 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 16 Jun 2014 19:18:47 +0000
(12:18 -0700)
* jk/error-resolve-conflict-advice:
error_resolve_conflict: drop quotations around operation
error_resolve_conflict: rewrap advice message
1
2
advice.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
57a2eee
d795216
)
diff --cc
advice.c
Simple merge