repo.or.cz
/
git
/
gitweb.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Make difftool.prompt fall back to mergetool.prompt
[git/gitweb.git]
/
t
/
t4101
/
diff.2-1
blob
a66d9fd3a137b22edf5a49cf811970fc85c985d9
1
--- a/frotz
2
+++ b/frotz
3
@@ -1,2 +1,3 @@
4
a
5
-b
6
\ No newline at end of file
7
+b
8
+c