]> git.neil.brown.name Git - edlib.git/commitdiff
projects / edlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d03624 52780b3)
Merge commit '52780b336a46654163e0d34204a0aad0da5fdf33'
authorNeilBrown <neil@brown.name>
Tue, 1 Dec 2015 20:19:43 +0000 (07:19 +1100)
committerNeilBrown <neil@brown.name>
Tue, 1 Dec 2015 20:19:43 +0000 (07:19 +1100)
1  2 
doc-text.c patch | diff1 | diff2 | blob | history

diff --cc doc-text.c
Simple merge
Because one more editor is never engough