Andrew's git / gitweb.git / diff
?
Merge branch 'us/printf-not-echo'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:08:26 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:08:27 +0000 (11:08 -0700)
* us/printf-not-echo:
test-lib.sh: do not "echo" caller-supplied strings
rebase -i: do not "echo" random user-supplied strings

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history
t/test-lib.sh patch | diff1 | diff2 | blob | history
diff --cc git-rebase--interactive.sh
Simple merge
diff --cc t/test-lib.sh
Simple merge