repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: portability fix: don't assume true is in /bin
2007-03-29
Theodor
e
Ts'o
m
e
r
g
eto
o
l: portabil
i
t
y
fix:
d
o
n't assume
true
is in
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore
Ts'o
me
r
getool: Don'
t
error
o
ut in
t
he mer
g
e ca
s
e
where
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool
:
Replace
use of
"
echo
-n" with print
f
(1)
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix minor formatt
i
ng is
s
ue in ma
n
page for
git-m
e
rg
e
tool
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
The
o
dore Ts'o
mergeto
o
l: print an a
p
prop
r
iate warning if merge
.
tool
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-19
Ja
m
es Bow
e
s
me
r
getool: Add support for vimdiff
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
A
d
d
g
it-m
e
r
getool to run an appropriate merg
e
confl
i
ct
.
.
.
Signed-off-by: "Theodore Ts'o" <
tytso@mit.edu
>
commit
|
commitdiff
|
tree
