repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2009-04-08
S
h
awn O
.
Pearce
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-08
Ferry Hubert
s
git-gui: E
n
sure consistent usage of
mergetool
.
kee
p
Backup
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-08
Joerg
Bornemann
git-gui: fix use of und
e
c
lar
e
d variable diff_empty_count
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Ma
r
kus Heidelbe
r
g
git-
g
ui (
W
in):
ma
k
e starting vi
a
"
Gi
t
G
U
I Here" on
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
g
it-gui (Win): make "Explo
r
e Worki
n
g Copy
"
more r
o
b
u
st
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
J
e
ns Lehmann
git-gui
:
run pos
t
-checkout
h
ook on check
o
ut
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
J
e
n
s
L
ehma
n
n
git-gu
i
: When c
a
lling
p
ost-commit hook wrong var
i
ab
l
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Ma
r
kus Heidelbe
r
g
git
-
gui:
u
se `g
i
t --html-path` to
g
et the location
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-30
Shawn O
.
Pearce
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Markus Heidelberg
git-gui: fix deleting from the conte
x
t menu with emp
t
y
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-24
S
a
m Hocevar
git-gui:
m
inor spe
l
ling fi
x
a
nd stri
n
g factoris
a
t
i
on
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-24
S
a
m
H
oc
e
v
a
r
git-gui: various French translation fix
e
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-20
Shaw
n
O
.
Pearce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-20
Jens Lehma
n
n
git-gu
i
: F
i
x merge conflict displ
a
y
e
r
ror whe
n
f
ile
n
ame
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-17
Sh
a
wn O
.
Pearce
M
e
rge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2009-03-17
Markus Heidelberg
git-gu
i
:
don't hi
d
e
the Browse button when r
e
s
i
zin
g
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-09
Phil Lawrence
A
p
p
end a
m
persand to "Targ
e
t" of
lnk fil
e
s cr
e
ate
d
b
y
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-08
Alexander
G
a
v
rilov
git-gui: Suppor
t
more git version notat
i
ons
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-08
Al
e
xander G
a
vrilov
git
-
gui: Avo
i
d an inf
i
nite
re
s
can loop in handle_empty_diff
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-01
Alexander Gavril
o
v
git-g
u
i: Fix post-com
m
it status wi
t
h
subject i
n
non
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-18
Sh
a
wn
O
.
P
e
arce
git-gui 0
.
12
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-17
J
o
h
a
n
ne
s
Schindel
i
n
git-gui: Get rid of th
e
last remn
a
nts
of
GIT_CON
F
IG
_
L
O
CAL
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos Vajna
gi
t
-gui: Update Hungar
i
an tran
s
lation for
0
.
12
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-10
Pet
e
r Kr
e
fting
git-
g
ui: Fixed t
y
pos
in Sw
e
dish transl
a
tion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
Peter
Krefting
git-gui: Up
d
ated Swedish translat
i
on
(515t0f0u)
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
Miche
l
e
B
a
ll
a
bio
git gui: update Ita
l
ia
n
translation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
Nanako Sh
i
raishi
git-gu
i
: Update
J
apanese
t
r
a
nslat
i
on
f
or 0
.
1
2
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
F
r
edri
k
S
k
olmli
git-gui:
Starti
n
g t
r
a
n
slati
o
n
f
or No
r
wegian
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Christ
i
an Stimming
git-gui: Update German
(co
m
plete
d
) trans
l
ation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Shawn
O
.
P
e
arce
g
it-gui: Update
p
o template to include 'Mirroring
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Alexa
n
der Gavrilov
g
i
t-gu
i
:
Fix c
o
mmit
encoding
h
andli
n
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
A
l
e
xander Gavri
l
o
v
git-
g
ui
:
Fix ha
n
dl
i
ng of relative path
s
in blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-02
Mark Burton
g
i
t
-
g
u
i
:
Teach star
t
_p
u
sh
_
anywher
e
_act
i
on{} to
n
o
t
ice
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-26
Nanako Shi
r
a
i
shi
git
-
gui: upd
a
te Japanese
transla
t
ion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-23
Christian Couder
git-gui: french translat
i
on update
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-21
Peter Krefting
U
pdat
e
d
Sw
e
dish tran
s
l
a
ti
o
n (514t0f
0
u)
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-19
Mi
c
hel
e
B
a
llabio
g
i
t gui: up
d
a
te Italian translation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
Update Hungar
i
an translation
.
100% comple
t
ed
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexande
r
Gavrilov
git-gui:
F
ix
the s
e
arch bar de
s
truct
i
o
n handler
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Shawn
O
.
Pearce
Update
the
po template
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexander G
a
v
rilov
git-gui:
I
mplement automa
t
ic rescan after
T
oo
l
execu
t
ion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Al
e
xander Gavrilo
v
git-gui:
A
llow Tools request arguments fr
o
m
the
user
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexan
d
er
G
avrilov
git-gu
i
: A
d
d a Tools
m
enu for
a
rbitrary commands
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexande
r
Gavrilov
git-
g
ui
:
Fix
t
he after c
a
llback ex
e
cution
i
n rescan
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexander
Gavrilov
git
-
gui: I
m
plement system-wide
c
onfiguratio
n
handl
i
ng
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
G
iuseppe Bilotta
g
i
t-gui: try to prov
i
d
e
a
window icon un
d
er X
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexan
d
er
Gav
r
ilov
git-gui: Request blame metadata in utf-8
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexan
d
er Gavril
o
v
git-gui: Add the Show SSH Key item to the cl
o
n
e
dialog
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexander Gavrilov
git-g
u
i: Fix
f
ocus
transition
i
n the blame viewer
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-02
Christian Stimming
git-gui:
Update German tran
s
lation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Joha
n
nes Sixt
git-gui: Do
n
ot munge
conflict mark
e
r
l
i
n
es
in
a normal
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Alexander Gavrilov
g
i
t-gui: Add a
simple implem
e
ntatio
n
of SSH
_
ASKPAS
S
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Alexander Gavrilov
git-gui: Add a dialog that sh
o
ws the
OpenSSH public
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Johann
e
s Si
x
t
g
it-gui: Ma
r
k-up string
s
in show_{other,unmerged}_
d
iff
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Johannes Sixt
git-gui: Show a round
number of
bytes of large un
t
rack
e
d
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Alexander Gavrilov
git-gui
:
Fix the
b
l
ame viewer dest
r
oy handler
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
A
l
exand
e
r Gavrilov
git-gui: Add a
s
earch com
m
an
d
t
o
the blam
e
vi
e
wer
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Alexander Gavri
l
o
v
git-gui: Fi
x
the blame w
i
ndow shape
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
J
o
h
an
n
es Sixt
g
it
-
gui: Fix switch s
t
a
t
ement in
l
ib/merge
.
tcl
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr B
a
udis
git-gui
:
Fix
f
etchi
n
g from remo
t
es wh
e
n adding them
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Ba
u
dis
git
-
g
u
i
: Fix removing n
o
n-pushable rem
o
t
e
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Baudis
git-gui
:
Make in
p
ut boxes in init/clone/open dialog
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r
Ba
u
di
s
git-gui:
Avoid
us
i
ng
the term URL when specifying
r
epositorie
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr
Baudi
s
git-g
u
i: gu
i
.
aut
o
explore make
s
ex
p
lorer to pop
u
p auto
m
atic
a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr
Baudis
git-gui
:
Add Expl
o
re Working C
o
py to the Rep
o
sito
r
y
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Baudis
git-gui
:
Use git we
b
--browse
r
fo
r
w
e
b
browsing
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Baudis
git-gu
i
: mkdir -
p
when initializing new
r
e
mote reposi
t
o
ry
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Baudis
git-
g
ui: Ad
d
suppor
t
for
remo
v
ing remote
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r
Ba
u
dis
git-gui: Add
support for adding remot
e
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
P
e
t
r
B
audis
git-gui: Squash
p
opulate_{push,fetch
}
_menu
t
o populate_r
e
mot
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr B
a
udis
g
it-gui:
C
lar
i
f
y the Remote ->
Delete
.
.
.
a
ct
i
on
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
J
ohannes
S
ixt
git-gui: Remove space from the
e
nd
o
f aspell's
reply
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
A
lexander Gavrilo
v
git-gui: Mak
e
C
trl-T safe to use for conf
l
icting files
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Joh
a
nnes Sixt
git-gui: Do not
a
utom
a
tically stage file after merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Shawn
O
.
Pearc
e
git-gui: Show/hide "Si
g
n Off" based on nocommitmsg
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Shawn O
.
Pea
r
ce
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-09-26
Gustaf H
e
ndeby
git-
g
ui: Help id
e
ntify aspell
v
e
rs
i
on on Win
d
ows too
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alex
a
nder Gavrilov
git-
g
u
i: Reena
b
le staging unmerged files
b
y cli
c
king
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
g
it-gui:
S
uppor
t
the encoding
m
enu
in gui blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
lexander
Gavrilov
git-gui: Optimize
encod
i
ng name resol
u
tion
u
sing a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexande
r
Gavr
i
lov
git-gui:
A
llow forcing displ
a
y encoding for diffs using
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-gui: Add
a
m
enu of a
v
aila
b
le enc
o
dings
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexande
r
Gav
r
ilov
git-gui: Cleanup handlin
g
of the default enco
d
in
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
git-gui: Assume
`
blame --i
n
cremental` output is in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
P
e
ar
c
e
git-gui: Use gitattribute "
e
ncodin
g
"
f
or file c
o
ntent
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Jos
h
ua
Williams
gi
t
-gui: Add support for calling out to the prep
a
re
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
P
ea
r
ce
git
-
gui
:
H
i
d
e co
m
mit related UI d
u
ring citool
--nocommit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexand
e
r
Gav
r
ilov
git
-
gui:
Add more integration options
t
o
citoo
l
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-13
Ch
r
istian
S
t
imming
git-
g
ui: Upd
a
ted G
e
rman translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-12
Christian Stimming
git-gui:
I
18n fix
s
e
ntence parts
i
nto full sentence
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexander G
a
v
r
i
lov
g
i
t-gui: Rest
o
r
e abilit
y
to Stage Wo
r
kin
g
Copy for
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
A
lexander Gav
r
ilov
g
i
t-gui:
F
ix Blame Pare
n
t
& Context
f
or working copy
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-09-05
S
hawn O
.
P
earc
e
git-
g
ui: Fix
d
if
f
p
a
r
sing for lines starting with
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavril
o
v
git-gui: Show special diff
s
f
or c
o
mplex conflict cases
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
er Gavr
i
lov
g
i
t-gui: Make F5 reselect a
diff, if
a
n
u
ntr
a
ck
e
d
f
ile
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nder
Gavrilov
git-
g
ui:
Re
i
mplement and en
h
ance au
t
o-selecti
o
n
of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
l
exande
r
Ga
v
rilov
gi
t
-
gui: S
u
pport con
f
li
c
t states _U & U
T
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui: Su
p
port mo
r
e merge tools
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexa
n
der Gavrilov
git-
g
ui
:
D
on't allow staging files
with c
o
nflict
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next