Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/add-i-highlight'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 3 Apr 2016 17:29:25 +0000
(10:29 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 3 Apr 2016 17:29:25 +0000
(10:29 -0700)
* jk/add-i-highlight:
add--interactive: allow custom diff highlighting programs
1
2
Documentation/config.txt
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
1b68962
0114384
)
diff --cc
Documentation/config.txt
Simple merge