doc/merge-config: list ecmerge as a built-in merge tool
[git/raj.git] / t / t4101 / diff.1-0
blobf0a2e92770870d78d32bef7fe2ed63ad4ca105de
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,3 +1,2 @@
4  a
5  b
6 -c