development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 10:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

mergetool: portability fix: don't assume true is in /bin

Browse source 
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2007-03-29 06:46:59 -04:00
parent ce5b6d752b
commit d1dc6959bb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git-mergetool.sh
View file

@ -61,7 +61,7 @@ function describe_file () {
resolve_symlink_merge () {
while /bin/true; do
while true; do
printf "Use (r)emote or (l)ocal, or (a)bort? "
read ans
case "$ans" in
@ -85,7 +85,7 @@ resolve_symlink_merge () {
}
resolve_deleted_merge () {
while /bin/true; do
while true; do
printf "Use (m)odified or (d)eleted file, or (a)bort? "
read ans
case "$ans" in